annotate libpurple/protocols/jabber/jingle/rtp.c @ 27712:813f2eb3fdc8

Fixes for some potential printf("%s", NULL) type of problems from Maiku
author Stu Tomlinson <stu@nosnilmot.com>
date Tue, 28 Jul 2009 02:30:39 +0000
parents df9042312063
children 584fa66dfb31
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
24947
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
26009
59188d904773 Fix compiling with --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24998
diff changeset
23 #ifdef USE_VV
59188d904773 Fix compiling with --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24998
diff changeset
24
24947
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"
24966
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24961
diff changeset
29 #include "iceudp.h"
24947
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;
26285
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
40 gchar *ssrc;
24947
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,
26285
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
67 PROP_SSRC,
24947
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));
26285
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
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: 26284
diff changeset
114 g_param_spec_string("ssrc",
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
115 "ssrc",
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
116 "The ssrc for this rtp session.",
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
117 NULL,
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
118 G_PARAM_READWRITE));
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
119
24947
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);
26285
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
127 memset(rtp->priv, 0, sizeof(*rtp->priv));
24947
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);
26285
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
137 g_free(priv->ssrc);
26290
44684f0d2e42 Plug some memory leaks related to transports.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26287
diff changeset
138
44684f0d2e42 Plug some memory leaks related to transports.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26287
diff changeset
139 G_OBJECT_CLASS(parent_class)->finalize(rtp);
24947
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;
26285
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
155 case PROP_SSRC:
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
156 g_free(rtp->priv->ssrc);
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
157 rtp->priv->ssrc = g_value_dup_string(value);
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
158 break;
24947
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;
26285
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
177 case PROP_SSRC:
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
178 g_value_set_string(value, rtp->priv->ssrc);
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
179 break;
24947
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
26285
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
194 gchar *
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
195 jingle_rtp_get_ssrc(JingleContent *content)
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
196 {
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
197 gchar *ssrc;
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
198 g_object_get(content, "ssrc", &ssrc, NULL);
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
199 return ssrc;
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
200 }
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
201
24947
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);
26124
f10034e0321b Get rid of the medias variable in JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26119
diff changeset
206 PurpleMedia *media = NULL;
26524
df9042312063 Switch media to store accounts rather than connections.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26474
diff changeset
207 GList *iter = purple_media_manager_get_media_by_account(
df9042312063 Switch media to store accounts rather than connections.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26474
diff changeset
208 purple_media_manager_get(),
df9042312063 Switch media to store accounts rather than connections.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26474
diff changeset
209 purple_connection_get_account(js->gc));
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
210
26124
f10034e0321b Get rid of the medias variable in JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26119
diff changeset
211 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: 26119
diff changeset
212 JingleSession *media_session =
f10034e0321b Get rid of the medias variable in JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26119
diff changeset
213 purple_media_get_prpl_data(iter->data);
f10034e0321b Get rid of the medias variable in JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26119
diff changeset
214 if (media_session == session) {
f10034e0321b Get rid of the medias variable in JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26119
diff changeset
215 media = iter->data;
f10034e0321b Get rid of the medias variable in JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26119
diff changeset
216 break;
f10034e0321b Get rid of the medias variable in JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26119
diff changeset
217 }
f10034e0321b Get rid of the medias variable in JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26119
diff changeset
218 }
f10034e0321b Get rid of the medias variable in JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26119
diff changeset
219 if (iter != NULL)
f10034e0321b Get rid of the medias variable in JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26119
diff changeset
220 g_list_free(iter);
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
221
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
222 return media;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
223 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
224
26296
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
225 static JingleRawUdpCandidate *
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
226 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: 26290
diff changeset
227 PurpleMediaCandidate *candidate)
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
228 {
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
229 gchar *id = jabber_get_next_id(jingle_session_get_js(session));
26406
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
230 gchar *ip = purple_media_candidate_get_ip(candidate);
26296
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
231 JingleRawUdpCandidate *rawudp_candidate =
26406
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
232 jingle_rawudp_candidate_new(id, generation,
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
233 purple_media_candidate_get_component_id(candidate),
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
234 ip, purple_media_candidate_get_port(candidate));
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
235 g_free(ip);
26296
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
236 g_free(id);
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
237 return rawudp_candidate;
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
238 }
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
239
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
240 static JingleIceUdpCandidate *
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
241 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: 26290
diff changeset
242 PurpleMediaCandidate *candidate)
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
243 {
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
244 gchar *id = jabber_get_next_id(jingle_session_get_js(session));
26406
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
245 gchar *ip = purple_media_candidate_get_ip(candidate);
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
246 gchar *username = purple_media_candidate_get_username(candidate);
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
247 gchar *password = purple_media_candidate_get_password(candidate);
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
248 PurpleMediaCandidateType type =
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
249 purple_media_candidate_get_candidate_type(candidate);
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
250
26296
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
251 JingleIceUdpCandidate *iceudp_candidate = jingle_iceudp_candidate_new(
26406
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
252 purple_media_candidate_get_component_id(candidate),
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
253 purple_media_candidate_get_foundation(candidate),
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
254 generation, id, ip, 0,
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
255 purple_media_candidate_get_port(candidate),
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
256 purple_media_candidate_get_priority(candidate), "udp",
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
257 type == PURPLE_MEDIA_CANDIDATE_TYPE_HOST ? "host" :
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
258 type == PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX ? "srflx" :
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
259 type == PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX ? "prflx" :
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
260 type == PURPLE_MEDIA_CANDIDATE_TYPE_RELAY ? "relay" :
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
261 "", username, password);
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
262 iceudp_candidate->reladdr =
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
263 purple_media_candidate_get_base_ip(candidate);
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
264 iceudp_candidate->relport =
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
265 purple_media_candidate_get_base_port(candidate);
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
266 g_free(password);
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
267 g_free(username);
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
268 g_free(ip);
26296
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
269 g_free(id);
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
270 return iceudp_candidate;
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
271 }
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
272
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
273 static JingleTransport *
24954
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24949
diff changeset
274 jingle_rtp_candidates_to_transport(JingleSession *session, GType type, guint generation, GList *candidates)
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
275 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
276 if (type == JINGLE_TYPE_RAWUDP) {
24954
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24949
diff changeset
277 JingleTransport *transport = jingle_transport_create(JINGLE_TRANSPORT_RAWUDP);
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24949
diff changeset
278 JingleRawUdpCandidate *rawudp_candidate;
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24949
diff changeset
279 for (; candidates; candidates = g_list_next(candidates)) {
26021
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26017
diff changeset
280 PurpleMediaCandidate *candidate = candidates->data;
26296
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
281 rawudp_candidate = jingle_rtp_candidate_to_rawudp(
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
282 session, generation, candidate);
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
283 jingle_rawudp_add_local_candidate(
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
284 JINGLE_RAWUDP(transport),
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
285 rawudp_candidate);
24954
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24949
diff changeset
286 }
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24949
diff changeset
287 return transport;
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
288 } else if (type == JINGLE_TYPE_ICEUDP) {
24966
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24961
diff changeset
289 JingleTransport *transport = jingle_transport_create(JINGLE_TRANSPORT_ICEUDP);
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24961
diff changeset
290 JingleIceUdpCandidate *iceudp_candidate;
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24961
diff changeset
291 for (; candidates; candidates = g_list_next(candidates)) {
26021
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26017
diff changeset
292 PurpleMediaCandidate *candidate = candidates->data;
26296
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
293 iceudp_candidate = jingle_rtp_candidate_to_iceudp(
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
294 session, generation, candidate);
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
295 jingle_iceudp_add_local_candidate(
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
296 JINGLE_ICEUDP(transport),
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
297 iceudp_candidate);
24966
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24961
diff changeset
298 }
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24961
diff changeset
299 return transport;
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
300 } else {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
301 return NULL;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
302 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
303 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
304
24954
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24949
diff changeset
305 static GList *
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24949
diff changeset
306 jingle_rtp_transport_to_candidates(JingleTransport *transport)
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
307 {
24954
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24949
diff changeset
308 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: 24949
diff changeset
309 GList *ret = NULL;
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
310 if (!strcmp(type, JINGLE_TRANSPORT_RAWUDP)) {
24954
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24949
diff changeset
311 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: 24949
diff changeset
312
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24949
diff changeset
313 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: 24949
diff changeset
314 JingleRawUdpCandidate *candidate = candidates->data;
26021
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26017
diff changeset
315 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: 26017
diff changeset
316 "", candidate->component,
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26017
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: 26017
diff changeset
318 PURPLE_MEDIA_NETWORK_PROTOCOL_UDP,
24954
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24949
diff changeset
319 candidate->ip, candidate->port));
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24949
diff changeset
320 }
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24949
diff changeset
321
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24949
diff changeset
322 return ret;
24966
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24961
diff changeset
323 } else if (!strcmp(type, JINGLE_TRANSPORT_ICEUDP)) {
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24961
diff changeset
324 GList *candidates = jingle_iceudp_get_remote_candidates(JINGLE_ICEUDP(transport));
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24961
diff changeset
325
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24961
diff changeset
326 for (; candidates; candidates = g_list_delete_link(candidates, candidates)) {
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24961
diff changeset
327 JingleIceUdpCandidate *candidate = candidates->data;
26021
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26017
diff changeset
328 PurpleMediaCandidate *new_candidate = purple_media_candidate_new(
24966
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24961
diff changeset
329 candidate->foundation, candidate->component,
26021
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26017
diff changeset
330 !strcmp(candidate->type, "host") ?
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26017
diff changeset
331 PURPLE_MEDIA_CANDIDATE_TYPE_HOST :
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26017
diff changeset
332 !strcmp(candidate->type, "srflx") ?
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26017
diff changeset
333 PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX :
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26017
diff changeset
334 !strcmp(candidate->type, "prflx") ?
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26017
diff changeset
335 PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX :
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26017
diff changeset
336 !strcmp(candidate->type, "relay") ?
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26017
diff changeset
337 PURPLE_MEDIA_CANDIDATE_TYPE_RELAY : 0,
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26017
diff changeset
338 PURPLE_MEDIA_NETWORK_PROTOCOL_UDP,
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26017
diff changeset
339 candidate->ip, candidate->port);
26406
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
340 g_object_set(new_candidate,
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
341 "base-ip", candidate->reladdr,
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
342 "base-port", candidate->relport,
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
343 "username", candidate->username,
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
344 "password", candidate->password,
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
345 "priority", candidate->priority, NULL);
26021
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26017
diff changeset
346 ret = g_list_append(ret, new_candidate);
24966
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24961
diff changeset
347 }
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24961
diff changeset
348
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24961
diff changeset
349 return ret;
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
350 } else {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
351 return NULL;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
352 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
353 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
354
26317
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
355 static void jingle_rtp_ready(JingleSession *session);
26311
0083c73e004b Move sending session-initiate out of the ready-new callback.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26308
diff changeset
356
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
357 static void
26060
5b64b7d8da39 Added the accepted signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26059
diff changeset
358 jingle_rtp_accepted_cb(PurpleMedia *media, gchar *sid, gchar *name,
5b64b7d8da39 Added the accepted signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26059
diff changeset
359 JingleSession *session)
5b64b7d8da39 Added the accepted signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26059
diff changeset
360 {
5b64b7d8da39 Added the accepted signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26059
diff changeset
361 purple_debug_info("jingle-rtp", "jingle_rtp_accepted_cb\n");
26317
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
362 jingle_rtp_ready(session);
26060
5b64b7d8da39 Added the accepted signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26059
diff changeset
363 }
5b64b7d8da39 Added the accepted signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26059
diff changeset
364
5b64b7d8da39 Added the accepted signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26059
diff changeset
365 static void
26299
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26298
diff changeset
366 jingle_rtp_candidates_prepared_cb(PurpleMedia *media,
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26298
diff changeset
367 gchar *sid, gchar *name, JingleSession *session)
26298
b892b3cb9dbc Add candidates-prepared signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26296
diff changeset
368 {
26299
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26298
diff changeset
369 JingleContent *content = jingle_session_find_content(
26302
95794e9acf71 Use new find_content wildcard.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26300
diff changeset
370 session, sid, NULL);
26299
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26298
diff changeset
371 JingleTransport *oldtransport, *transport;
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26298
diff changeset
372 GList *candidates;
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26298
diff changeset
373
26298
b892b3cb9dbc Add candidates-prepared signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26296
diff changeset
374 purple_debug_info("jingle-rtp", "jingle_rtp_candidates_prepared_cb\n");
26299
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26298
diff changeset
375
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26298
diff changeset
376 if (content == NULL) {
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26298
diff changeset
377 purple_debug_error("jingle-rtp",
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26298
diff changeset
378 "jingle_rtp_candidates_prepared_cb: "
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26298
diff changeset
379 "Can't find session %s\n", sid);
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26298
diff changeset
380 return;
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26298
diff changeset
381 }
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26298
diff changeset
382
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26298
diff changeset
383 oldtransport = jingle_content_get_transport(content);
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26298
diff changeset
384 candidates = purple_media_get_local_candidates(media, sid, name);
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26298
diff changeset
385 transport = JINGLE_TRANSPORT(jingle_rtp_candidates_to_transport(
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26298
diff changeset
386 session, JINGLE_IS_RAWUDP(oldtransport) ?
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26298
diff changeset
387 JINGLE_TYPE_RAWUDP : JINGLE_TYPE_ICEUDP,
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26298
diff changeset
388 0, candidates));
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26298
diff changeset
389
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26298
diff changeset
390 g_list_free(candidates);
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26298
diff changeset
391 g_object_unref(oldtransport);
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26298
diff changeset
392
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26298
diff changeset
393 jingle_content_set_pending_transport(content, transport);
d784e9ea7f50 Implement jingle_rtp_candidates_prepared_cb.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26298
diff changeset
394 jingle_content_accept_transport(content);
26311
0083c73e004b Move sending session-initiate out of the ready-new callback.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26308
diff changeset
395
26317
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
396 jingle_rtp_ready(session);
26298
b892b3cb9dbc Add candidates-prepared signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26296
diff changeset
397 }
b892b3cb9dbc Add candidates-prepared signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26296
diff changeset
398
b892b3cb9dbc Add candidates-prepared signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26296
diff changeset
399 static void
26059
1ff5304f6e9d Added codecs-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26058
diff changeset
400 jingle_rtp_codecs_changed_cb(PurpleMedia *media, gchar *sid,
1ff5304f6e9d Added codecs-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26058
diff changeset
401 JingleSession *session)
1ff5304f6e9d Added codecs-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26058
diff changeset
402 {
1ff5304f6e9d Added codecs-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26058
diff changeset
403 purple_debug_info("jingle-rtp", "jingle_rtp_codecs_changed_cb: "
1ff5304f6e9d Added codecs-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26058
diff changeset
404 "session_id: %s jingle_session: %p\n", sid, session);
26317
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
405 jingle_rtp_ready(session);
26059
1ff5304f6e9d Added codecs-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26058
diff changeset
406 }
1ff5304f6e9d Added codecs-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26058
diff changeset
407
1ff5304f6e9d Added codecs-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26058
diff changeset
408 static void
26021
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26017
diff changeset
409 jingle_rtp_new_candidate_cb(PurpleMedia *media, gchar *sid, gchar *name, PurpleMediaCandidate *candidate, JingleSession *session)
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
410 {
26296
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
411 JingleContent *content = jingle_session_find_content(
26302
95794e9acf71 Use new find_content wildcard.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26300
diff changeset
412 session, sid, NULL);
26296
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
413 JingleTransport *transport;
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
414
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
415 purple_debug_info("jingle-rtp", "jingle_rtp_new_candidate_cb\n");
26296
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
416
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
417 if (content == NULL) {
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
418 purple_debug_error("jingle-rtp",
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
419 "jingle_rtp_new_candidate_cb: "
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
420 "Can't find session %s\n", sid);
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
421 return;
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
422 }
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
423
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
424 transport = jingle_content_get_transport(content);
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
425
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
426 if (JINGLE_IS_ICEUDP(transport))
26297
045be0c868a6 Silence two warnings.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26296
diff changeset
427 jingle_iceudp_add_local_candidate(JINGLE_ICEUDP(transport),
26296
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
428 jingle_rtp_candidate_to_iceudp(
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
429 session, 1, candidate));
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
430 else if (JINGLE_IS_RAWUDP(transport))
26297
045be0c868a6 Silence two warnings.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26296
diff changeset
431 jingle_rawudp_add_local_candidate(JINGLE_RAWUDP(transport),
26296
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
432 jingle_rtp_candidate_to_rawudp(
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
433 session, 1, candidate));
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
434
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
435 g_object_unref(transport);
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
436
55c77c8e75cf Send any additional candidates found after session-initiate or
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26290
diff changeset
437 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: 26290
diff changeset
438 JINGLE_TRANSPORT_INFO));
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
439 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
440
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
441 static void
26472
3c684403ea10 Fix merge for ./jingle/
Paul Aurich <paul@darkrain42.org>
parents: 26406
diff changeset
442 jingle_rtp_initiate_ack_cb(JabberStream *js, const char *from,
3c684403ea10 Fix merge for ./jingle/
Paul Aurich <paul@darkrain42.org>
parents: 26406
diff changeset
443 JabberIqType type, const char *id,
3c684403ea10 Fix merge for ./jingle/
Paul Aurich <paul@darkrain42.org>
parents: 26406
diff changeset
444 xmlnode *packet, gpointer data)
26105
836f2e0b3b22 Wait to send transport-info until the session-initiate ack is received.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26098
diff changeset
445 {
836f2e0b3b22 Wait to send transport-info until the session-initiate ack is received.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26098
diff changeset
446 JingleSession *session = data;
836f2e0b3b22 Wait to send transport-info until the session-initiate ack is received.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26098
diff changeset
447
26472
3c684403ea10 Fix merge for ./jingle/
Paul Aurich <paul@darkrain42.org>
parents: 26406
diff changeset
448 if (type == JABBER_IQ_ERROR || xmlnode_get_child(packet, "error")) {
26105
836f2e0b3b22 Wait to send transport-info until the session-initiate ack is received.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26098
diff changeset
449 purple_media_end(jingle_rtp_get_media(session), NULL, NULL);
26106
9cda61a15698 Free the session as well on error.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26105
diff changeset
450 g_object_unref(session);
26105
836f2e0b3b22 Wait to send transport-info until the session-initiate ack is received.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26098
diff changeset
451 return;
836f2e0b3b22 Wait to send transport-info until the session-initiate ack is received.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26098
diff changeset
452 }
836f2e0b3b22 Wait to send transport-info until the session-initiate ack is received.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26098
diff changeset
453 }
836f2e0b3b22 Wait to send transport-info until the session-initiate ack is received.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26098
diff changeset
454
836f2e0b3b22 Wait to send transport-info until the session-initiate ack is received.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26098
diff changeset
455 static void
26329
86bc2d34f689 Rename state-changed enum and values.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26321
diff changeset
456 jingle_rtp_state_changed_cb(PurpleMedia *media, PurpleMediaState state,
24993
7d2e06b29f88 Add state-changed signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24992
diff changeset
457 gchar *sid, gchar *name, JingleSession *session)
7d2e06b29f88 Add state-changed signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24992
diff changeset
458 {
26329
86bc2d34f689 Rename state-changed enum and values.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26321
diff changeset
459 purple_debug_info("jingle-rtp", "state-changed: state %d "
27712
813f2eb3fdc8 Fixes for some potential printf("%s", NULL) type of problems from Maiku
Stu Tomlinson <stu@nosnilmot.com>
parents: 26524
diff changeset
460 "id: %s name: %s\n", state, sid ? sid : "(null)",
813f2eb3fdc8 Fixes for some potential printf("%s", NULL) type of problems from Maiku
Stu Tomlinson <stu@nosnilmot.com>
parents: 26524
diff changeset
461 name ? name : "(null)");
26321
2c9fb8ac325b Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26317
diff changeset
462 }
24994
50309309bc4d Use the state-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24993
diff changeset
463
26321
2c9fb8ac325b Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26317
diff changeset
464 static void
2c9fb8ac325b Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26317
diff changeset
465 jingle_rtp_stream_info_cb(PurpleMedia *media, PurpleMediaInfoType type,
26366
4e1286e76f1f Create purple_media_stream_info. Add local parameter to stream-info signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26365
diff changeset
466 gchar *sid, gchar *name, gboolean local,
4e1286e76f1f Create purple_media_stream_info. Add local parameter to stream-info signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26365
diff changeset
467 JingleSession *session)
26321
2c9fb8ac325b Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26317
diff changeset
468 {
2c9fb8ac325b Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26317
diff changeset
469 purple_debug_info("jingle-rtp", "stream-info: type %d "
27712
813f2eb3fdc8 Fixes for some potential printf("%s", NULL) type of problems from Maiku
Stu Tomlinson <stu@nosnilmot.com>
parents: 26524
diff changeset
470 "id: %s name: %s\n", type, sid ? sid : "(null)",
813f2eb3fdc8 Fixes for some potential printf("%s", NULL) type of problems from Maiku
Stu Tomlinson <stu@nosnilmot.com>
parents: 26524
diff changeset
471 name ? name : "(null)");
26524
df9042312063 Switch media to store accounts rather than connections.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26474
diff changeset
472
df9042312063 Switch media to store accounts rather than connections.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26474
diff changeset
473 g_return_if_fail(JINGLE_IS_SESSION(session));
df9042312063 Switch media to store accounts rather than connections.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26474
diff changeset
474
26321
2c9fb8ac325b Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26317
diff changeset
475 if (type == PURPLE_MEDIA_INFO_HANGUP) {
26284
4f47eeaa1414 Add functions for more easily creating session-terminate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26124
diff changeset
476 jabber_iq_send(jingle_session_terminate_packet(
4f47eeaa1414 Add functions for more easily creating session-terminate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26124
diff changeset
477 session, "success"));
24994
50309309bc4d Use the state-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24993
diff changeset
478 g_object_unref(session);
26321
2c9fb8ac325b Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26317
diff changeset
479 } else if (type == PURPLE_MEDIA_INFO_REJECT) {
2c9fb8ac325b Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26317
diff changeset
480 jabber_iq_send(jingle_session_terminate_packet(
2c9fb8ac325b Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26317
diff changeset
481 session, "decline"));
2c9fb8ac325b Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26317
diff changeset
482 g_object_unref(session);
24994
50309309bc4d Use the state-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24993
diff changeset
483 }
24993
7d2e06b29f88 Add state-changed signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24992
diff changeset
484 }
7d2e06b29f88 Add state-changed signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24992
diff changeset
485
26311
0083c73e004b Move sending session-initiate out of the ready-new callback.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26308
diff changeset
486 static void
26317
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
487 jingle_rtp_ready(JingleSession *session)
26311
0083c73e004b Move sending session-initiate out of the ready-new callback.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26308
diff changeset
488 {
0083c73e004b Move sending session-initiate out of the ready-new callback.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26308
diff changeset
489 PurpleMedia *media = jingle_rtp_get_media(session);
0083c73e004b Move sending session-initiate out of the ready-new callback.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26308
diff changeset
490
26317
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
491 if (purple_media_candidates_prepared(media, NULL, NULL) &&
26311
0083c73e004b Move sending session-initiate out of the ready-new callback.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26308
diff changeset
492 purple_media_codecs_ready(media, NULL) &&
26317
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
493 (jingle_session_is_initiator(session) == TRUE ||
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
494 purple_media_accepted(media, NULL, NULL))) {
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
495 if (jingle_session_is_initiator(session)) {
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
496 JabberIq *iq = jingle_session_to_packet(
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
497 session, JINGLE_SESSION_INITIATE);
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
498 jabber_iq_set_callback(iq,
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
499 jingle_rtp_initiate_ack_cb, session);
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
500 jabber_iq_send(iq);
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
501 } else {
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
502 jabber_iq_send(jingle_session_to_packet(session,
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
503 JINGLE_SESSION_ACCEPT));
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
504 }
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
505
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
506 g_signal_handlers_disconnect_by_func(G_OBJECT(media),
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
507 G_CALLBACK(jingle_rtp_accepted_cb), session);
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
508 g_signal_handlers_disconnect_by_func(G_OBJECT(media),
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
509 G_CALLBACK(jingle_rtp_candidates_prepared_cb),
26311
0083c73e004b Move sending session-initiate out of the ready-new callback.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26308
diff changeset
510 session);
26317
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
511 g_signal_handlers_disconnect_by_func(G_OBJECT(media),
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
512 G_CALLBACK(jingle_rtp_codecs_changed_cb),
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
513 session);
26313
96ffb196d18d Move sending session-accept out of the ready-new signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26311
diff changeset
514 g_signal_connect(G_OBJECT(media), "new-candidate",
96ffb196d18d Move sending session-accept out of the ready-new signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26311
diff changeset
515 G_CALLBACK(jingle_rtp_new_candidate_cb),
96ffb196d18d Move sending session-accept out of the ready-new signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26311
diff changeset
516 session);
96ffb196d18d Move sending session-accept out of the ready-new signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26311
diff changeset
517 }
96ffb196d18d Move sending session-accept out of the ready-new signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26311
diff changeset
518 }
96ffb196d18d Move sending session-accept out of the ready-new signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26311
diff changeset
519
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
520 static PurpleMedia *
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
521 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
522 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
523 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
524 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
525 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
526
26524
df9042312063 Switch media to store accounts rather than connections.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26474
diff changeset
527 PurpleMedia *media = purple_media_manager_create_media(
df9042312063 Switch media to store accounts rather than connections.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26474
diff changeset
528 purple_media_manager_get(),
df9042312063 Switch media to store accounts rather than connections.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26474
diff changeset
529 purple_connection_get_account(js->gc),
df9042312063 Switch media to store accounts rather than connections.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26474
diff changeset
530 "fsrtpconference", remote_jid,
df9042312063 Switch media to store accounts rather than connections.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26474
diff changeset
531 jingle_session_is_initiator(session));
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
532 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
533
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
534 if (!media) {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
535 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
536 return NULL;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
537 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
538
26124
f10034e0321b Get rid of the medias variable in JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26119
diff changeset
539 purple_media_set_prpl_data(media, session);
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
540
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
541 /* connect callbacks */
26317
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
542 if (jingle_session_is_initiator(session) == FALSE)
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
543 g_signal_connect(G_OBJECT(media), "accepted",
85c571d11417 Stop sending multiple session-initiate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26313
diff changeset
544 G_CALLBACK(jingle_rtp_accepted_cb), session);
26298
b892b3cb9dbc Add candidates-prepared signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26296
diff changeset
545 g_signal_connect(G_OBJECT(media), "candidates-prepared",
b892b3cb9dbc Add candidates-prepared signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26296
diff changeset
546 G_CALLBACK(jingle_rtp_candidates_prepared_cb), session);
26059
1ff5304f6e9d Added codecs-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26058
diff changeset
547 g_signal_connect(G_OBJECT(media), "codecs-changed",
1ff5304f6e9d Added codecs-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26058
diff changeset
548 G_CALLBACK(jingle_rtp_codecs_changed_cb), session);
24993
7d2e06b29f88 Add state-changed signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24992
diff changeset
549 g_signal_connect(G_OBJECT(media), "state-changed",
7d2e06b29f88 Add state-changed signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24992
diff changeset
550 G_CALLBACK(jingle_rtp_state_changed_cb), session);
26321
2c9fb8ac325b Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26317
diff changeset
551 g_signal_connect(G_OBJECT(media), "stream-info",
2c9fb8ac325b Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26317
diff changeset
552 G_CALLBACK(jingle_rtp_stream_info_cb), session);
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
553
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
554 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
555 return media;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
556 }
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 static gboolean
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
559 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
560 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
561 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
562 PurpleMedia *media = jingle_rtp_get_media(session);
26384
bea334b214fa Add purple_media_is_initiator.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26371
diff changeset
563 gchar *creator;
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
564 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
565 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
566 gchar *senders;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
567 gchar *name;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
568 const gchar *transmitter;
26017
b6457b2a8e14 Make FsStreamDirection and FsMediaType conversion functions static.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26009
diff changeset
569 gboolean is_audio;
26384
bea334b214fa Add purple_media_is_initiator.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26371
diff changeset
570 gboolean is_creator;
26017
b6457b2a8e14 Make FsStreamDirection and FsMediaType conversion functions static.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26009
diff changeset
571 PurpleMediaSessionType type;
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
572 JingleTransport *transport;
26080
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26060
diff changeset
573 GParameter *params = NULL;
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26060
diff changeset
574 guint num_params;
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
575
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
576 /* 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
577 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
578 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
579
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
580 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
581 return FALSE;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
582
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
583 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
584 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
585 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
586 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
587 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
588
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
589 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
590 transmitter = "rawudp";
24966
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24961
diff changeset
591 else if (JINGLE_IS_ICEUDP(transport))
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24961
diff changeset
592 transmitter = "nice";
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
593 else
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
594 transmitter = "notransmitter";
26290
44684f0d2e42 Plug some memory leaks related to transports.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26287
diff changeset
595 g_object_unref(transport);
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
596
26017
b6457b2a8e14 Make FsStreamDirection and FsMediaType conversion functions static.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26009
diff changeset
597 is_audio = !strcmp(media_type, "audio");
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
598
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
599 if (!strcmp(senders, "both"))
26017
b6457b2a8e14 Make FsStreamDirection and FsMediaType conversion functions static.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26009
diff changeset
600 type = is_audio == TRUE ? PURPLE_MEDIA_AUDIO
b6457b2a8e14 Make FsStreamDirection and FsMediaType conversion functions static.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26009
diff changeset
601 : PURPLE_MEDIA_VIDEO;
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
602 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
603 && jingle_session_is_initiator(session))
26017
b6457b2a8e14 Make FsStreamDirection and FsMediaType conversion functions static.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26009
diff changeset
604 type = is_audio == TRUE ? PURPLE_MEDIA_SEND_AUDIO
b6457b2a8e14 Make FsStreamDirection and FsMediaType conversion functions static.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26009
diff changeset
605 : PURPLE_MEDIA_SEND_VIDEO;
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
606 else
26017
b6457b2a8e14 Make FsStreamDirection and FsMediaType conversion functions static.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26009
diff changeset
607 type = is_audio == TRUE ? PURPLE_MEDIA_RECV_AUDIO
b6457b2a8e14 Make FsStreamDirection and FsMediaType conversion functions static.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26009
diff changeset
608 : PURPLE_MEDIA_RECV_VIDEO;
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
609
26080
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26060
diff changeset
610 params =
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26060
diff changeset
611 jingle_get_params(jingle_session_get_js(session), &num_params);
26384
bea334b214fa Add purple_media_is_initiator.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26371
diff changeset
612
bea334b214fa Add purple_media_is_initiator.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26371
diff changeset
613 creator = jingle_content_get_creator(content);
bea334b214fa Add purple_media_is_initiator.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26371
diff changeset
614 if (!strcmp(creator, "initiator"))
bea334b214fa Add purple_media_is_initiator.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26371
diff changeset
615 is_creator = jingle_session_is_initiator(session);
bea334b214fa Add purple_media_is_initiator.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26371
diff changeset
616 else
bea334b214fa Add purple_media_is_initiator.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26371
diff changeset
617 is_creator = !jingle_session_is_initiator(session);
bea334b214fa Add purple_media_is_initiator.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26371
diff changeset
618 g_free(creator);
bea334b214fa Add purple_media_is_initiator.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26371
diff changeset
619
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
620 purple_media_add_stream(media, name, remote_jid,
26384
bea334b214fa Add purple_media_is_initiator.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26371
diff changeset
621 type, is_creator, transmitter, num_params, params);
24947
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 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
624 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
625 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
626 g_free(senders);
26080
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26060
diff changeset
627 g_free(params);
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
628 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
629
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
630 return TRUE;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
631 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
632
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
633 static GList *
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
634 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
635 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
636 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
637 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
638 const char *encoding_name,*id, *clock_rate;
26024
ac4d7695dbc7 Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26021
diff changeset
639 PurpleMediaCodec *codec;
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
640 const gchar *media = xmlnode_get_attrib(description, "media");
26024
ac4d7695dbc7 Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26021
diff changeset
641 PurpleMediaSessionType type =
ac4d7695dbc7 Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26021
diff changeset
642 !strcmp(media, "video") ? PURPLE_MEDIA_VIDEO :
ac4d7695dbc7 Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26021
diff changeset
643 !strcmp(media, "audio") ? PURPLE_MEDIA_AUDIO : 0;
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
644
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
645 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
646 codec_element ;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
647 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
648 xmlnode *param;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
649 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
650 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
651
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
652 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
653 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
654
26024
ac4d7695dbc7 Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26021
diff changeset
655 codec = purple_media_codec_new(atoi(id), encoding_name,
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
656 type,
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
657 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
658
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
659 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
660 param; param = xmlnode_get_next_twin(param)) {
26024
ac4d7695dbc7 Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26021
diff changeset
661 purple_media_codec_add_optional_parameter(codec,
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
662 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
663 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
664 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
665
26024
ac4d7695dbc7 Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26021
diff changeset
666 codec_str = purple_media_codec_to_string(codec);
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
667 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
668 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
669
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
670 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
671 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
672 return codecs;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
673 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
674
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
675 static JingleContent *
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
676 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
677 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
678 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
679 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
680 const gchar *media_type = xmlnode_get_attrib(description, "media");
26285
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
681 const gchar *ssrc = xmlnode_get_attrib(description, "ssrc");
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
682 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
683 g_object_set(content, "media-type", media_type, NULL);
26285
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
684 if (ssrc != NULL)
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
685 g_object_set(content, "ssrc", ssrc, NULL);
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
686 return content;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
687 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
688
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
689 static void
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
690 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
691 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
692 for (; codecs ; codecs = codecs->next) {
26024
ac4d7695dbc7 Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26021
diff changeset
693 PurpleMediaCodec *codec = (PurpleMediaCodec*)codecs->data;
26404
217574ec2a34 Hide and gobjectify PurpleMediaCodec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26403
diff changeset
694 GList *iter = purple_media_codec_get_optional_parameters(codec);
217574ec2a34 Hide and gobjectify PurpleMediaCodec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26403
diff changeset
695 gchar *id, *name, *clockrate, *channels;
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
696 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
697 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
698
26404
217574ec2a34 Hide and gobjectify PurpleMediaCodec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26403
diff changeset
699 id = g_strdup_printf("%d",
217574ec2a34 Hide and gobjectify PurpleMediaCodec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26403
diff changeset
700 purple_media_codec_get_id(codec));
217574ec2a34 Hide and gobjectify PurpleMediaCodec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26403
diff changeset
701 name = purple_media_codec_get_encoding_name(codec);
217574ec2a34 Hide and gobjectify PurpleMediaCodec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26403
diff changeset
702 clockrate = g_strdup_printf("%d",
217574ec2a34 Hide and gobjectify PurpleMediaCodec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26403
diff changeset
703 purple_media_codec_get_clock_rate(codec));
217574ec2a34 Hide and gobjectify PurpleMediaCodec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26403
diff changeset
704 channels = g_strdup_printf("%d",
217574ec2a34 Hide and gobjectify PurpleMediaCodec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26403
diff changeset
705 purple_media_codec_get_channels(codec));
217574ec2a34 Hide and gobjectify PurpleMediaCodec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26403
diff changeset
706
217574ec2a34 Hide and gobjectify PurpleMediaCodec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26403
diff changeset
707 xmlnode_set_attrib(payload, "name", name);
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
708 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
709 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
710 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
711
26404
217574ec2a34 Hide and gobjectify PurpleMediaCodec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26403
diff changeset
712 g_free(channels);
217574ec2a34 Hide and gobjectify PurpleMediaCodec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26403
diff changeset
713 g_free(clockrate);
217574ec2a34 Hide and gobjectify PurpleMediaCodec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26403
diff changeset
714 g_free(name);
217574ec2a34 Hide and gobjectify PurpleMediaCodec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26403
diff changeset
715 g_free(id);
217574ec2a34 Hide and gobjectify PurpleMediaCodec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26403
diff changeset
716
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
717 for (; iter; iter = g_list_next(iter)) {
26403
f0de2405c2f1 Use PurpleMediaKeyPair. Remove PurpleMediaCodecParameter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26384
diff changeset
718 PurpleKeyValuePair *mparam = iter->data;
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
719 xmlnode *param = xmlnode_new_child(payload, "parameter");
26403
f0de2405c2f1 Use PurpleMediaKeyPair. Remove PurpleMediaCodecParameter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26384
diff changeset
720 xmlnode_set_attrib(param, "name", mparam->key);
26024
ac4d7695dbc7 Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26021
diff changeset
721 xmlnode_set_attrib(param, "value", mparam->value);
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
722 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
723
26024
ac4d7695dbc7 Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26021
diff changeset
724 codec_str = purple_media_codec_to_string(codec);
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
725 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
726 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
727 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
728 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
729
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
730 static xmlnode *
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
731 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
732 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
733 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
734 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
735 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
736 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
737 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
738 gchar *media_type = jingle_rtp_get_media_type(rtp);
26285
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
739 gchar *ssrc = jingle_rtp_get_ssrc(rtp);
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
740 gchar *name = jingle_content_get_name(rtp);
24960
a5f1804fcb4b Combine get_*_codecs functions to mirror Farsight 2.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24956
diff changeset
741 GList *codecs = purple_media_get_codecs(media, name);
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
742
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
743 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
744
26285
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
745 if (ssrc != NULL)
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
746 xmlnode_set_attrib(description, "ssrc", ssrc);
b1c4fcc5b814 Add ssrc property to JingleRtp.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26284
diff changeset
747
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
748 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
749 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
750 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
751
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
752 jingle_rtp_add_payloads(description, codecs);
26308
f34fd86de085 Plug memory leak.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26302
diff changeset
753 purple_media_codec_list_free(codecs);
24947
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 return node;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
756 }
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 static void
24949
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24947
diff changeset
759 jingle_rtp_handle_action_internal(JingleContent *content, xmlnode *xmlcontent, JingleActionType action)
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
760 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
761 switch (action) {
26287
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26285
diff changeset
762 case JINGLE_SESSION_ACCEPT:
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
763 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
764 JingleSession *session = jingle_content_get_session(content);
24954
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24949
diff changeset
765 JingleTransport *transport = jingle_transport_parse(
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24949
diff changeset
766 xmlnode_get_child(xmlcontent, "transport"));
24949
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24947
diff changeset
767 xmlnode *description = xmlnode_get_child(xmlcontent, "description");
24954
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24949
diff changeset
768 GList *candidates = jingle_rtp_transport_to_candidates(transport);
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
769 GList *codecs = jingle_rtp_parse_codecs(description);
26287
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26285
diff changeset
770 gchar *name = jingle_content_get_name(content);
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26285
diff changeset
771 gchar *remote_jid =
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26285
diff changeset
772 jingle_session_get_remote_jid(session);
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26285
diff changeset
773 PurpleMedia *media;
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
774
26287
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26285
diff changeset
775 if (action == JINGLE_SESSION_INITIATE &&
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26285
diff changeset
776 jingle_rtp_init_media(content) == FALSE) {
24956
b83c83143a69 Fix crash when remote client reconnects and tries to restart the media session.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24954
diff changeset
777 /* XXX: send error */
26284
4f47eeaa1414 Add functions for more easily creating session-terminate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26124
diff changeset
778 jabber_iq_send(jingle_session_terminate_packet(
4f47eeaa1414 Add functions for more easily creating session-terminate packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26124
diff changeset
779 session, "general-error"));
24956
b83c83143a69 Fix crash when remote client reconnects and tries to restart the media session.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24954
diff changeset
780 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: 24954
diff changeset
781 break;
b83c83143a69 Fix crash when remote client reconnects and tries to restart the media session.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24954
diff changeset
782 }
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
783
26287
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26285
diff changeset
784 media = jingle_rtp_get_media(session);
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26285
diff changeset
785 purple_media_set_remote_codecs(media,
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26285
diff changeset
786 name, remote_jid, codecs);
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26285
diff changeset
787 purple_media_add_remote_candidates(media,
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26285
diff changeset
788 name, remote_jid, candidates);
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
789
26371
12c7db418c3e Remove purple_media_accept.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26369
diff changeset
790 if (action == JINGLE_SESSION_ACCEPT)
12c7db418c3e Remove purple_media_accept.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26369
diff changeset
791 purple_media_stream_info(media,
12c7db418c3e Remove purple_media_accept.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26369
diff changeset
792 PURPLE_MEDIA_INFO_ACCEPT,
12c7db418c3e Remove purple_media_accept.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26369
diff changeset
793 name, remote_jid, FALSE);
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
794
26287
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26285
diff changeset
795 g_free(remote_jid);
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26285
diff changeset
796 g_free(name);
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
797 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
798 break;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
799 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
800 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
801 JingleSession *session = jingle_content_get_session(content);
24992
d881fc5d907f Remove PurpleMedias from JabberStream's list when a media session ends.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24991
diff changeset
802 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: 24991
diff changeset
803
d881fc5d907f Remove PurpleMedias from JabberStream's list when a media session ends.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24991
diff changeset
804 if (media != NULL) {
26058
ac56e5707a72 Added purple_media_end and removed the purple_media_got_hangup.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26040
diff changeset
805 purple_media_end(media, NULL, NULL);
24992
d881fc5d907f Remove PurpleMedias from JabberStream's list when a media session ends.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24991
diff changeset
806 }
d881fc5d907f Remove PurpleMedias from JabberStream's list when a media session ends.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24991
diff changeset
807
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
808 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
809 break;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
810 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
811 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
812 JingleSession *session = jingle_content_get_session(content);
24954
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24949
diff changeset
813 JingleTransport *transport = jingle_transport_parse(
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24949
diff changeset
814 xmlnode_get_child(xmlcontent, "transport"));
365eb0b68d5f Update Jingle raw-udp to latest spec version.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24949
diff changeset
815 GList *candidates = jingle_rtp_transport_to_candidates(transport);
26287
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26285
diff changeset
816 gchar *name = jingle_content_get_name(content);
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26285
diff changeset
817 gchar *remote_jid =
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26285
diff changeset
818 jingle_session_get_remote_jid(session);
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
819
26287
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26285
diff changeset
820 purple_media_add_remote_candidates(
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26285
diff changeset
821 jingle_rtp_get_media(session),
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26285
diff changeset
822 name, remote_jid, candidates);
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26285
diff changeset
823
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26285
diff changeset
824 g_free(remote_jid);
26cf297796a5 Update Jingle Ice-Udp according to the XEP.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26285
diff changeset
825 g_free(name);
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
826 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
827 break;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
828 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
829 default:
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
830 break;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
831 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
832 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
833
26365
34eb898478b4 Don't assume a PurpleMedia instance will be created immediately.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26329
diff changeset
834 gboolean
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
835 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
836 PurpleMediaSessionType type)
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
837 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
838 /* 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
839 JingleSession *session;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
840 JingleContent *content;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
841 JingleTransport *transport;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
842 JabberBuddy *jb;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
843 JabberBuddyResource *jbr;
24970
99055b8db16b Choose the transport type according to the responder's caps.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24966
diff changeset
844 const gchar *transport_type;
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
845
26432
0adf41b3de79 Add a resource selector when initiating media.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26406
diff changeset
846 gchar *resource = NULL, *me = NULL, *sid = NULL;
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
847
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
848 /* 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
849 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
850 if (!jb) {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
851 purple_debug_error("jingle-rtp", "Could not find Jabber buddy\n");
26365
34eb898478b4 Don't assume a PurpleMedia instance will be created immediately.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26329
diff changeset
852 return FALSE;
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
853 }
26432
0adf41b3de79 Add a resource selector when initiating media.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26406
diff changeset
854
0adf41b3de79 Add a resource selector when initiating media.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26406
diff changeset
855 resource = jabber_get_resource(who);
0adf41b3de79 Add a resource selector when initiating media.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26406
diff changeset
856 jbr = jabber_buddy_find_resource(jb, resource);
0adf41b3de79 Add a resource selector when initiating media.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26406
diff changeset
857 g_free(resource);
0adf41b3de79 Add a resource selector when initiating media.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26406
diff changeset
858
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
859 if (!jbr) {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
860 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
861 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
862
24970
99055b8db16b Choose the transport type according to the responder's caps.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24966
diff changeset
863 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: 24966
diff changeset
864 transport_type = JINGLE_TRANSPORT_ICEUDP;
99055b8db16b Choose the transport type according to the responder's caps.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24966
diff changeset
865 } 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: 24966
diff changeset
866 transport_type = JINGLE_TRANSPORT_RAWUDP;
99055b8db16b Choose the transport type according to the responder's caps.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24966
diff changeset
867 } else {
99055b8db16b Choose the transport type according to the responder's caps.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24966
diff changeset
868 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: 24966
diff changeset
869 "the same transport types\n");
26365
34eb898478b4 Don't assume a PurpleMedia instance will be created immediately.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26329
diff changeset
870 return FALSE;
24970
99055b8db16b Choose the transport type according to the responder's caps.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24966
diff changeset
871 }
99055b8db16b Choose the transport type according to the responder's caps.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24966
diff changeset
872
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
873 /* 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
874 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
875
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
876 sid = jabber_get_next_id(js);
26432
0adf41b3de79 Add a resource selector when initiating media.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26406
diff changeset
877 session = jingle_session_create(js, sid, me, who, TRUE);
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
878 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
879
24949
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24947
diff changeset
880
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24947
diff changeset
881 if (type & PURPLE_MEDIA_AUDIO) {
24970
99055b8db16b Choose the transport type according to the responder's caps.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24966
diff changeset
882 transport = jingle_transport_create(transport_type);
24949
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24947
diff changeset
883 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: 24947
diff changeset
884 "session", "audio-session", "both", transport);
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24947
diff changeset
885 jingle_session_add_content(session, content);
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
886 JINGLE_RTP(content)->priv->media_type = g_strdup("audio");
24949
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24947
diff changeset
887 jingle_rtp_init_media(content);
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24947
diff changeset
888 }
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24947
diff changeset
889 if (type & PURPLE_MEDIA_VIDEO) {
24970
99055b8db16b Choose the transport type according to the responder's caps.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24966
diff changeset
890 transport = jingle_transport_create(transport_type);
24949
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24947
diff changeset
891 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: 24947
diff changeset
892 "session", "video-session", "both", transport);
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24947
diff changeset
893 jingle_session_add_content(session, content);
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
894 JINGLE_RTP(content)->priv->media_type = g_strdup("video");
24949
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24947
diff changeset
895 jingle_rtp_init_media(content);
1a2d446cb8a0 Fix support for audio and video (at the same time) sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24947
diff changeset
896 }
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
897
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
898 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
899
26365
34eb898478b4 Don't assume a PurpleMedia instance will be created immediately.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26329
diff changeset
900 if (jingle_rtp_get_media(session) == NULL) {
34eb898478b4 Don't assume a PurpleMedia instance will be created immediately.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26329
diff changeset
901 return FALSE;
34eb898478b4 Don't assume a PurpleMedia instance will be created immediately.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26329
diff changeset
902 }
34eb898478b4 Don't assume a PurpleMedia instance will be created immediately.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26329
diff changeset
903
34eb898478b4 Don't assume a PurpleMedia instance will be created immediately.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26329
diff changeset
904 return TRUE;
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
905 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
906
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
907 void
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
908 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
909 {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
910 JingleSession *session;
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
911 /* 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
912 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
913
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
914 if (session) {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
915 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
916 if (media) {
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
917 purple_debug_info("jingle-rtp", "hanging up media\n");
26369
2862fee7acf2 Remove purple_media_hangup.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
918 purple_media_stream_info(media,
2862fee7acf2 Remove purple_media_hangup.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
919 PURPLE_MEDIA_INFO_HANGUP,
2862fee7acf2 Remove purple_media_hangup.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
920 NULL, NULL, TRUE);
24947
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
921 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
922 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
923 }
7252e3d0c627 Add files I missed committing before and remove a few unnecessary functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff changeset
924
26009
59188d904773 Fix compiling with --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24998
diff changeset
925 #endif /* USE_VV */
59188d904773 Fix compiling with --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24998
diff changeset
926