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