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