Tue, 17 Mar 2009 11:57:22 +0000
Update Jingle Ice-Udp according to the XEP.
This mainly includes sending and receiving candidates in
session-initiate and session-accept packets. It also includes a few
memory leak fixes.
|
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); |
|
26147
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
138 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
139 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
140 | static void |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
141 | 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
|
142 | { |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
143 | JingleRtp *rtp; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
144 | 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
|
145 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
146 | 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
|
147 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
148 | switch (prop_id) { |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
149 | 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
|
150 | 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
|
151 | 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
|
152 | break; |
|
26405
4cf4d5dcc183
Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents:
26404
diff
changeset
|
153 | case PROP_SSRC: |
|
4cf4d5dcc183
Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents:
26404
diff
changeset
|
154 | g_free(rtp->priv->ssrc); |
|
4cf4d5dcc183
Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents:
26404
diff
changeset
|
155 | rtp->priv->ssrc = g_value_dup_string(value); |
|
4cf4d5dcc183
Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents:
26404
diff
changeset
|
156 | break; |
|
26147
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
157 | default: |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
158 | 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
|
159 | break; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
160 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
161 | } |
|
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 | static void |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
164 | 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
|
165 | { |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
166 | JingleRtp *rtp; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
167 | 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
|
168 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
169 | 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
|
170 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
171 | switch (prop_id) { |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
172 | 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
|
173 | 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
|
174 | break; |
|
26405
4cf4d5dcc183
Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents:
26404
diff
changeset
|
175 | case PROP_SSRC: |
|
4cf4d5dcc183
Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents:
26404
diff
changeset
|
176 | g_value_set_string(value, rtp->priv->ssrc); |
|
4cf4d5dcc183
Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents:
26404
diff
changeset
|
177 | break; |
|
26147
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
178 | default: |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
179 | 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
|
180 | break; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
181 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
182 | } |
|
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 | gchar * |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
185 | 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
|
186 | { |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
187 | gchar *media_type; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
188 | 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
|
189 | return media_type; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
190 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
191 | |
|
26405
4cf4d5dcc183
Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents:
26404
diff
changeset
|
192 | gchar * |
|
4cf4d5dcc183
Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents:
26404
diff
changeset
|
193 | jingle_rtp_get_ssrc(JingleContent *content) |
|
4cf4d5dcc183
Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents:
26404
diff
changeset
|
194 | { |
|
4cf4d5dcc183
Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents:
26404
diff
changeset
|
195 | gchar *ssrc; |
|
4cf4d5dcc183
Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents:
26404
diff
changeset
|
196 | g_object_get(content, "ssrc", &ssrc, NULL); |
|
4cf4d5dcc183
Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents:
26404
diff
changeset
|
197 | return ssrc; |
|
4cf4d5dcc183
Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents:
26404
diff
changeset
|
198 | } |
|
4cf4d5dcc183
Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents:
26404
diff
changeset
|
199 | |
|
26147
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
200 | static PurpleMedia * |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
201 | 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
|
202 | { |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
203 | 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
|
204 | PurpleMedia *media = NULL; |
|
9d627ae05002
Get rid of the medias variable in JabberStream.
Michael Ruprecht <maiku@pidgin.im>
parents:
26325
diff
changeset
|
205 | GList *iter = purple_media_manager_get_media_by_connection( |
|
9d627ae05002
Get rid of the medias variable in JabberStream.
Michael Ruprecht <maiku@pidgin.im>
parents:
26325
diff
changeset
|
206 | purple_media_manager_get(), js->gc); |
|
26147
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
207 | |
|
26330
9d627ae05002
Get rid of the medias variable in JabberStream.
Michael Ruprecht <maiku@pidgin.im>
parents:
26325
diff
changeset
|
208 | 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
|
209 | JingleSession *media_session = |
|
9d627ae05002
Get rid of the medias variable in JabberStream.
Michael Ruprecht <maiku@pidgin.im>
parents:
26325
diff
changeset
|
210 | 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
|
211 | if (media_session == session) { |
|
9d627ae05002
Get rid of the medias variable in JabberStream.
Michael Ruprecht <maiku@pidgin.im>
parents:
26325
diff
changeset
|
212 | media = iter->data; |
|
9d627ae05002
Get rid of the medias variable in JabberStream.
Michael Ruprecht <maiku@pidgin.im>
parents:
26325
diff
changeset
|
213 | break; |
|
9d627ae05002
Get rid of the medias variable in JabberStream.
Michael Ruprecht <maiku@pidgin.im>
parents:
26325
diff
changeset
|
214 | } |
|
9d627ae05002
Get rid of the medias variable in JabberStream.
Michael Ruprecht <maiku@pidgin.im>
parents:
26325
diff
changeset
|
215 | } |
|
9d627ae05002
Get rid of the medias variable in JabberStream.
Michael Ruprecht <maiku@pidgin.im>
parents:
26325
diff
changeset
|
216 | if (iter != NULL) |
|
9d627ae05002
Get rid of the medias variable in JabberStream.
Michael Ruprecht <maiku@pidgin.im>
parents:
26325
diff
changeset
|
217 | 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
|
218 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
219 | return media; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
220 | } |
|
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 | static JingleTransport * |
|
26154
78fa18d44718
Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents:
26149
diff
changeset
|
223 | 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
|
224 | { |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
225 | if (type == JINGLE_TYPE_RAWUDP) { |
|
26154
78fa18d44718
Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents:
26149
diff
changeset
|
226 | 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
|
227 | JingleRawUdpCandidate *rawudp_candidate; |
|
78fa18d44718
Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents:
26149
diff
changeset
|
228 | 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
|
229 | PurpleMediaCandidate *candidate = candidates->data; |
| 26303 | 230 | gchar *id = jabber_get_next_id( |
| 231 | jingle_session_get_js(session)); | |
|
26154
78fa18d44718
Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents:
26149
diff
changeset
|
232 | rawudp_candidate = jingle_rawudp_candidate_new(id, |
|
78fa18d44718
Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents:
26149
diff
changeset
|
233 | generation, candidate->component_id, |
|
78fa18d44718
Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents:
26149
diff
changeset
|
234 | candidate->ip, candidate->port); |
|
78fa18d44718
Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents:
26149
diff
changeset
|
235 | jingle_rawudp_add_local_candidate(JINGLE_RAWUDP(transport), rawudp_candidate); |
| 26303 | 236 | g_free(id); |
|
26154
78fa18d44718
Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents:
26149
diff
changeset
|
237 | } |
|
78fa18d44718
Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents:
26149
diff
changeset
|
238 | return transport; |
|
26147
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
239 | } else if (type == JINGLE_TYPE_ICEUDP) { |
|
26166
ad7d09fef256
Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents:
26161
diff
changeset
|
240 | JingleTransport *transport = jingle_transport_create(JINGLE_TRANSPORT_ICEUDP); |
|
ad7d09fef256
Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents:
26161
diff
changeset
|
241 | JingleIceUdpCandidate *iceudp_candidate; |
|
ad7d09fef256
Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents:
26161
diff
changeset
|
242 | 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
|
243 | PurpleMediaCandidate *candidate = candidates->data; |
|
26302
0fb3ad9495a5
Add the id attribute to ice-udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26286
diff
changeset
|
244 | gchar *id = jabber_get_next_id( |
|
0fb3ad9495a5
Add the id attribute to ice-udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26286
diff
changeset
|
245 | jingle_session_get_js(session)); |
|
26166
ad7d09fef256
Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents:
26161
diff
changeset
|
246 | iceudp_candidate = jingle_iceudp_candidate_new(candidate->component_id, |
|
26302
0fb3ad9495a5
Add the id attribute to ice-udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26286
diff
changeset
|
247 | candidate->foundation, generation, id, candidate->ip, |
|
26166
ad7d09fef256
Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents:
26161
diff
changeset
|
248 | 0, candidate->port, candidate->priority, "udp", |
|
26229
3e786c9ebb62
Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
26226
diff
changeset
|
249 | candidate->type == PURPLE_MEDIA_CANDIDATE_TYPE_HOST ? "host" : |
|
3e786c9ebb62
Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
26226
diff
changeset
|
250 | candidate->type == PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX ? "srflx" : |
|
3e786c9ebb62
Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
26226
diff
changeset
|
251 | candidate->type == PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX ? "prflx" : |
|
3e786c9ebb62
Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
26226
diff
changeset
|
252 | candidate->type == PURPLE_MEDIA_CANDIDATE_TYPE_RELAY ? "relay" : "", |
|
26166
ad7d09fef256
Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents:
26161
diff
changeset
|
253 | candidate->username, candidate->password); |
|
26325
5427d1073629
Use the correct values for Jingle Ice-Udp's rel-addr and rel-port.
Michael Ruprecht <maiku@pidgin.im>
parents:
26312
diff
changeset
|
254 | iceudp_candidate->reladdr = g_strdup(candidate->base_ip); |
|
5427d1073629
Use the correct values for Jingle Ice-Udp's rel-addr and rel-port.
Michael Ruprecht <maiku@pidgin.im>
parents:
26312
diff
changeset
|
255 | iceudp_candidate->relport = candidate->base_port; |
|
26166
ad7d09fef256
Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents:
26161
diff
changeset
|
256 | jingle_iceudp_add_local_candidate(JINGLE_ICEUDP(transport), iceudp_candidate); |
|
26302
0fb3ad9495a5
Add the id attribute to ice-udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26286
diff
changeset
|
257 | g_free(id); |
|
26166
ad7d09fef256
Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents:
26161
diff
changeset
|
258 | } |
|
ad7d09fef256
Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents:
26161
diff
changeset
|
259 | return transport; |
|
26147
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
260 | } else { |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
261 | return NULL; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
262 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
263 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
264 | |
|
26154
78fa18d44718
Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents:
26149
diff
changeset
|
265 | static GList * |
|
78fa18d44718
Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents:
26149
diff
changeset
|
266 | 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
|
267 | { |
|
26154
78fa18d44718
Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents:
26149
diff
changeset
|
268 | 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
|
269 | 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
|
270 | 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
|
271 | 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
|
272 | |
|
78fa18d44718
Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents:
26149
diff
changeset
|
273 | 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
|
274 | JingleRawUdpCandidate *candidate = candidates->data; |
|
26229
3e786c9ebb62
Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
26226
diff
changeset
|
275 | 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
|
276 | "", candidate->component, |
|
3e786c9ebb62
Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
26226
diff
changeset
|
277 | PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX, |
|
3e786c9ebb62
Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
26226
diff
changeset
|
278 | PURPLE_MEDIA_NETWORK_PROTOCOL_UDP, |
|
26154
78fa18d44718
Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents:
26149
diff
changeset
|
279 | candidate->ip, candidate->port)); |
|
78fa18d44718
Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents:
26149
diff
changeset
|
280 | } |
|
78fa18d44718
Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents:
26149
diff
changeset
|
281 | |
|
78fa18d44718
Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents:
26149
diff
changeset
|
282 | return ret; |
|
26166
ad7d09fef256
Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents:
26161
diff
changeset
|
283 | } else if (!strcmp(type, JINGLE_TRANSPORT_ICEUDP)) { |
|
ad7d09fef256
Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents:
26161
diff
changeset
|
284 | 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
|
285 | |
|
ad7d09fef256
Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents:
26161
diff
changeset
|
286 | 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
|
287 | JingleIceUdpCandidate *candidate = candidates->data; |
|
26229
3e786c9ebb62
Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
26226
diff
changeset
|
288 | PurpleMediaCandidate *new_candidate = purple_media_candidate_new( |
|
26166
ad7d09fef256
Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents:
26161
diff
changeset
|
289 | candidate->foundation, candidate->component, |
|
26229
3e786c9ebb62
Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
26226
diff
changeset
|
290 | !strcmp(candidate->type, "host") ? |
|
3e786c9ebb62
Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
26226
diff
changeset
|
291 | PURPLE_MEDIA_CANDIDATE_TYPE_HOST : |
|
3e786c9ebb62
Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
26226
diff
changeset
|
292 | !strcmp(candidate->type, "srflx") ? |
|
3e786c9ebb62
Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
26226
diff
changeset
|
293 | PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX : |
|
3e786c9ebb62
Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
26226
diff
changeset
|
294 | !strcmp(candidate->type, "prflx") ? |
|
3e786c9ebb62
Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
26226
diff
changeset
|
295 | PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX : |
|
3e786c9ebb62
Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
26226
diff
changeset
|
296 | !strcmp(candidate->type, "relay") ? |
|
3e786c9ebb62
Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
26226
diff
changeset
|
297 | 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
|
298 | PURPLE_MEDIA_NETWORK_PROTOCOL_UDP, |
|
3e786c9ebb62
Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
26226
diff
changeset
|
299 | candidate->ip, candidate->port); |
|
26325
5427d1073629
Use the correct values for Jingle Ice-Udp's rel-addr and rel-port.
Michael Ruprecht <maiku@pidgin.im>
parents:
26312
diff
changeset
|
300 | new_candidate->base_ip = g_strdup(candidate->reladdr); |
|
5427d1073629
Use the correct values for Jingle Ice-Udp's rel-addr and rel-port.
Michael Ruprecht <maiku@pidgin.im>
parents:
26312
diff
changeset
|
301 | new_candidate->base_port = candidate->relport; |
|
26229
3e786c9ebb62
Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
26226
diff
changeset
|
302 | new_candidate->username = g_strdup(candidate->username); |
|
3e786c9ebb62
Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
26226
diff
changeset
|
303 | new_candidate->password = g_strdup(candidate->password); |
|
3e786c9ebb62
Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
26226
diff
changeset
|
304 | new_candidate->priority = candidate->priority; |
|
3e786c9ebb62
Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
26226
diff
changeset
|
305 | ret = g_list_append(ret, new_candidate); |
|
26166
ad7d09fef256
Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents:
26161
diff
changeset
|
306 | } |
|
ad7d09fef256
Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents:
26161
diff
changeset
|
307 | |
|
ad7d09fef256
Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents:
26161
diff
changeset
|
308 | return ret; |
|
26147
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
309 | } else { |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
310 | return NULL; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
311 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
312 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
313 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
314 | static void |
|
26266
069e72982f87
Added the accepted signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26265
diff
changeset
|
315 | jingle_rtp_accepted_cb(PurpleMedia *media, gchar *sid, gchar *name, |
|
069e72982f87
Added the accepted signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26265
diff
changeset
|
316 | JingleSession *session) |
|
069e72982f87
Added the accepted signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26265
diff
changeset
|
317 | { |
|
069e72982f87
Added the accepted signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26265
diff
changeset
|
318 | purple_debug_info("jingle-rtp", "jingle_rtp_accepted_cb\n"); |
|
069e72982f87
Added the accepted signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26265
diff
changeset
|
319 | } |
|
069e72982f87
Added the accepted signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26265
diff
changeset
|
320 | |
|
069e72982f87
Added the accepted signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26265
diff
changeset
|
321 | static void |
|
26265
66aee93241e2
Added codecs-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26264
diff
changeset
|
322 | jingle_rtp_codecs_changed_cb(PurpleMedia *media, gchar *sid, |
|
66aee93241e2
Added codecs-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26264
diff
changeset
|
323 | JingleSession *session) |
|
66aee93241e2
Added codecs-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26264
diff
changeset
|
324 | { |
|
66aee93241e2
Added codecs-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26264
diff
changeset
|
325 | purple_debug_info("jingle-rtp", "jingle_rtp_codecs_changed_cb: " |
|
66aee93241e2
Added codecs-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26264
diff
changeset
|
326 | "session_id: %s jingle_session: %p\n", sid, session); |
|
66aee93241e2
Added codecs-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26264
diff
changeset
|
327 | } |
|
66aee93241e2
Added codecs-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26264
diff
changeset
|
328 | |
|
66aee93241e2
Added codecs-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26264
diff
changeset
|
329 | static void |
|
26229
3e786c9ebb62
Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
26226
diff
changeset
|
330 | 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
|
331 | { |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
332 | purple_debug_info("jingle-rtp", "jingle_rtp_new_candidate_cb\n"); |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
333 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
334 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
335 | static void |
|
26311
0baf4bc1b441
Wait to send transport-info until the session-initiate ack is received.
Michael Ruprecht <maiku@pidgin.im>
parents:
26303
diff
changeset
|
336 | jingle_rtp_initiate_ack_cb(JabberStream *js, xmlnode *packet, gpointer data) |
|
0baf4bc1b441
Wait to send transport-info until the session-initiate ack is received.
Michael Ruprecht <maiku@pidgin.im>
parents:
26303
diff
changeset
|
337 | { |
|
0baf4bc1b441
Wait to send transport-info until the session-initiate ack is received.
Michael Ruprecht <maiku@pidgin.im>
parents:
26303
diff
changeset
|
338 | 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
|
339 | |
|
0baf4bc1b441
Wait to send transport-info until the session-initiate ack is received.
Michael Ruprecht <maiku@pidgin.im>
parents:
26303
diff
changeset
|
340 | if (!strcmp(xmlnode_get_attrib(packet, "type"), "error") || |
|
0baf4bc1b441
Wait to send transport-info until the session-initiate ack is received.
Michael Ruprecht <maiku@pidgin.im>
parents:
26303
diff
changeset
|
341 | xmlnode_get_child(packet, "error")) { |
|
0baf4bc1b441
Wait to send transport-info until the session-initiate ack is received.
Michael Ruprecht <maiku@pidgin.im>
parents:
26303
diff
changeset
|
342 | 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
|
343 | 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
|
344 | return; |
|
0baf4bc1b441
Wait to send transport-info until the session-initiate ack is received.
Michael Ruprecht <maiku@pidgin.im>
parents:
26303
diff
changeset
|
345 | } |
|
0baf4bc1b441
Wait to send transport-info until the session-initiate ack is received.
Michael Ruprecht <maiku@pidgin.im>
parents:
26303
diff
changeset
|
346 | } |
|
0baf4bc1b441
Wait to send transport-info until the session-initiate ack is received.
Michael Ruprecht <maiku@pidgin.im>
parents:
26303
diff
changeset
|
347 | |
|
0baf4bc1b441
Wait to send transport-info until the session-initiate ack is received.
Michael Ruprecht <maiku@pidgin.im>
parents:
26303
diff
changeset
|
348 | static void |
|
26190
8d7ea9d4f8d4
Have XMPP use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26189
diff
changeset
|
349 | jingle_rtp_ready_cb(PurpleMedia *media, gchar *sid, gchar *name, JingleSession *session) |
|
26147
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
350 | { |
|
26190
8d7ea9d4f8d4
Have XMPP use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26189
diff
changeset
|
351 | purple_debug_info("rtp", "ready-new: session: %s name: %s\n", sid, name); |
|
26147
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
352 | |
|
26191
12ec5694e4a4
Use the new ready signal instead of accept to send a session-accept.
Michael Ruprecht <maiku@pidgin.im>
parents:
26190
diff
changeset
|
353 | if (sid == NULL && name == NULL) { |
|
12ec5694e4a4
Use the new ready signal instead of accept to send a session-accept.
Michael Ruprecht <maiku@pidgin.im>
parents:
26190
diff
changeset
|
354 | if (jingle_session_is_initiator(session) == TRUE) { |
|
26311
0baf4bc1b441
Wait to send transport-info until the session-initiate ack is received.
Michael Ruprecht <maiku@pidgin.im>
parents:
26303
diff
changeset
|
355 | JabberIq *iq = jingle_session_to_packet( |
|
0baf4bc1b441
Wait to send transport-info until the session-initiate ack is received.
Michael Ruprecht <maiku@pidgin.im>
parents:
26303
diff
changeset
|
356 | session, JINGLE_SESSION_INITIATE); |
|
26407
48782a6424e0
Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26405
diff
changeset
|
357 | jabber_iq_set_callback(iq, |
|
48782a6424e0
Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26405
diff
changeset
|
358 | jingle_rtp_initiate_ack_cb, session); |
|
26311
0baf4bc1b441
Wait to send transport-info until the session-initiate ack is received.
Michael Ruprecht <maiku@pidgin.im>
parents:
26303
diff
changeset
|
359 | jabber_iq_send(iq); |
|
26191
12ec5694e4a4
Use the new ready signal instead of accept to send a session-accept.
Michael Ruprecht <maiku@pidgin.im>
parents:
26190
diff
changeset
|
360 | } else { |
|
12ec5694e4a4
Use the new ready signal instead of accept to send a session-accept.
Michael Ruprecht <maiku@pidgin.im>
parents:
26190
diff
changeset
|
361 | jabber_iq_send(jingle_session_to_packet(session, JINGLE_SESSION_ACCEPT)); |
|
26166
ad7d09fef256
Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents:
26161
diff
changeset
|
362 | } |
|
26196
ae4a4a68e65d
Move functionality to the state-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26195
diff
changeset
|
363 | } else if (sid != NULL && name != NULL) { |
|
ae4a4a68e65d
Move functionality to the state-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26195
diff
changeset
|
364 | JingleContent *content = jingle_session_find_content(session, sid, "initiator"); |
|
ae4a4a68e65d
Move functionality to the state-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26195
diff
changeset
|
365 | JingleTransport *oldtransport = jingle_content_get_transport(content); |
|
ae4a4a68e65d
Move functionality to the state-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26195
diff
changeset
|
366 | GList *candidates = purple_media_get_local_candidates(media, sid, name); |
|
ae4a4a68e65d
Move functionality to the state-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26195
diff
changeset
|
367 | JingleTransport *transport = |
|
ae4a4a68e65d
Move functionality to the state-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26195
diff
changeset
|
368 | JINGLE_TRANSPORT(jingle_rtp_candidates_to_transport( |
|
ae4a4a68e65d
Move functionality to the state-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26195
diff
changeset
|
369 | session, JINGLE_IS_RAWUDP(oldtransport) ? |
|
ae4a4a68e65d
Move functionality to the state-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26195
diff
changeset
|
370 | JINGLE_TYPE_RAWUDP : JINGLE_TYPE_ICEUDP, |
|
ae4a4a68e65d
Move functionality to the state-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26195
diff
changeset
|
371 | 0, candidates)); |
|
ae4a4a68e65d
Move functionality to the state-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26195
diff
changeset
|
372 | g_list_free(candidates); |
|
ae4a4a68e65d
Move functionality to the state-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26195
diff
changeset
|
373 | |
|
ae4a4a68e65d
Move functionality to the state-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26195
diff
changeset
|
374 | jingle_content_set_pending_transport(content, transport); |
|
ae4a4a68e65d
Move functionality to the state-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26195
diff
changeset
|
375 | jingle_content_accept_transport(content); |
|
26147
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
376 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
377 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
378 | |
|
26193
101122f0f3dd
Add state-changed signal to PurpleMedia.
Michael Ruprecht <maiku@pidgin.im>
parents:
26192
diff
changeset
|
379 | static void |
|
101122f0f3dd
Add state-changed signal to PurpleMedia.
Michael Ruprecht <maiku@pidgin.im>
parents:
26192
diff
changeset
|
380 | jingle_rtp_state_changed_cb(PurpleMedia *media, PurpleMediaStateChangedType type, |
|
101122f0f3dd
Add state-changed signal to PurpleMedia.
Michael Ruprecht <maiku@pidgin.im>
parents:
26192
diff
changeset
|
381 | gchar *sid, gchar *name, JingleSession *session) |
|
101122f0f3dd
Add state-changed signal to PurpleMedia.
Michael Ruprecht <maiku@pidgin.im>
parents:
26192
diff
changeset
|
382 | { |
|
101122f0f3dd
Add state-changed signal to PurpleMedia.
Michael Ruprecht <maiku@pidgin.im>
parents:
26192
diff
changeset
|
383 | purple_debug_info("jingle-rtp", "state-changed: type %d id: %s name: %s\n", type, sid, name); |
|
26194
b8aab50491f4
Use the state-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26193
diff
changeset
|
384 | |
|
26237
9f5f3c147950
Added reject and hangup states to the state-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26232
diff
changeset
|
385 | if ((type == PURPLE_MEDIA_STATE_CHANGED_REJECTED || |
|
9f5f3c147950
Added reject and hangup states to the state-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26232
diff
changeset
|
386 | type == PURPLE_MEDIA_STATE_CHANGED_HANGUP) && |
|
26195
0106a513554b
Temporarily fix an oversight.
Michael Ruprecht <maiku@pidgin.im>
parents:
26194
diff
changeset
|
387 | sid == NULL && name == NULL) { |
|
26404
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26330
diff
changeset
|
388 | 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
|
389 | session, "success")); |
|
26194
b8aab50491f4
Use the state-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26193
diff
changeset
|
390 | g_object_unref(session); |
|
b8aab50491f4
Use the state-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26193
diff
changeset
|
391 | } |
|
26193
101122f0f3dd
Add state-changed signal to PurpleMedia.
Michael Ruprecht <maiku@pidgin.im>
parents:
26192
diff
changeset
|
392 | } |
|
101122f0f3dd
Add state-changed signal to PurpleMedia.
Michael Ruprecht <maiku@pidgin.im>
parents:
26192
diff
changeset
|
393 | |
|
26147
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
394 | static PurpleMedia * |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
395 | 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
|
396 | { |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
397 | 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
|
398 | 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
|
399 | 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
|
400 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
401 | PurpleMedia *media = purple_media_manager_create_media(purple_media_manager_get(), |
|
26187
3b3059a7c091
Add initiator property to PurpleMedia.
Michael Ruprecht <maiku@pidgin.im>
parents:
26170
diff
changeset
|
402 | js->gc, "fsrtpconference", remote_jid, |
|
3b3059a7c091
Add initiator property to PurpleMedia.
Michael Ruprecht <maiku@pidgin.im>
parents:
26170
diff
changeset
|
403 | 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
|
404 | 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
|
405 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
406 | if (!media) { |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
407 | 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
|
408 | return NULL; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
409 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
410 | |
|
26330
9d627ae05002
Get rid of the medias variable in JabberStream.
Michael Ruprecht <maiku@pidgin.im>
parents:
26325
diff
changeset
|
411 | 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
|
412 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
413 | /* connect callbacks */ |
|
26266
069e72982f87
Added the accepted signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26265
diff
changeset
|
414 | g_signal_connect(G_OBJECT(media), "accepted", |
|
069e72982f87
Added the accepted signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26265
diff
changeset
|
415 | G_CALLBACK(jingle_rtp_accepted_cb), session); |
|
26265
66aee93241e2
Added codecs-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26264
diff
changeset
|
416 | g_signal_connect(G_OBJECT(media), "codecs-changed", |
|
66aee93241e2
Added codecs-changed signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26264
diff
changeset
|
417 | G_CALLBACK(jingle_rtp_codecs_changed_cb), session); |
|
26147
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
418 | g_signal_connect(G_OBJECT(media), "new-candidate", |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
419 | G_CALLBACK(jingle_rtp_new_candidate_cb), session); |
|
26189
32cf2cf21fd6
Implement a new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26187
diff
changeset
|
420 | g_signal_connect(G_OBJECT(media), "ready-new", |
|
26190
8d7ea9d4f8d4
Have XMPP use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26189
diff
changeset
|
421 | G_CALLBACK(jingle_rtp_ready_cb), session); |
|
26193
101122f0f3dd
Add state-changed signal to PurpleMedia.
Michael Ruprecht <maiku@pidgin.im>
parents:
26192
diff
changeset
|
422 | g_signal_connect(G_OBJECT(media), "state-changed", |
|
101122f0f3dd
Add state-changed signal to PurpleMedia.
Michael Ruprecht <maiku@pidgin.im>
parents:
26192
diff
changeset
|
423 | G_CALLBACK(jingle_rtp_state_changed_cb), session); |
|
26147
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
424 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
425 | 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
|
426 | return media; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
427 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
428 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
429 | static gboolean |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
430 | 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
|
431 | { |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
432 | 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
|
433 | 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
|
434 | gchar *media_type; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
435 | gchar *remote_jid; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
436 | gchar *senders; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
437 | gchar *name; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
438 | const gchar *transmitter; |
|
26226
dcb05990f479
Make FsStreamDirection and FsMediaType conversion functions static.
Michael Ruprecht <maiku@pidgin.im>
parents:
26215
diff
changeset
|
439 | gboolean is_audio; |
|
dcb05990f479
Make FsStreamDirection and FsMediaType conversion functions static.
Michael Ruprecht <maiku@pidgin.im>
parents:
26215
diff
changeset
|
440 | PurpleMediaSessionType type; |
|
26147
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
441 | 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
|
442 | 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
|
443 | 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
|
444 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
445 | /* 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
|
446 | if (media == NULL) |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
447 | 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
|
448 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
449 | if (media == NULL) |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
450 | return FALSE; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
451 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
452 | 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
|
453 | 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
|
454 | 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
|
455 | 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
|
456 | 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
|
457 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
458 | 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
|
459 | transmitter = "rawudp"; |
|
26166
ad7d09fef256
Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents:
26161
diff
changeset
|
460 | else if (JINGLE_IS_ICEUDP(transport)) |
|
ad7d09fef256
Added a Jingle ice-udp transmitter.
Michael Ruprecht <maiku@pidgin.im>
parents:
26161
diff
changeset
|
461 | transmitter = "nice"; |
|
26147
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
462 | else |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
463 | transmitter = "notransmitter"; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
464 | |
|
26226
dcb05990f479
Make FsStreamDirection and FsMediaType conversion functions static.
Michael Ruprecht <maiku@pidgin.im>
parents:
26215
diff
changeset
|
465 | 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
|
466 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
467 | if (!strcmp(senders, "both")) |
|
26226
dcb05990f479
Make FsStreamDirection and FsMediaType conversion functions static.
Michael Ruprecht <maiku@pidgin.im>
parents:
26215
diff
changeset
|
468 | type = is_audio == TRUE ? PURPLE_MEDIA_AUDIO |
|
dcb05990f479
Make FsStreamDirection and FsMediaType conversion functions static.
Michael Ruprecht <maiku@pidgin.im>
parents:
26215
diff
changeset
|
469 | : 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
|
470 | 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
|
471 | && jingle_session_is_initiator(session)) |
|
26226
dcb05990f479
Make FsStreamDirection and FsMediaType conversion functions static.
Michael Ruprecht <maiku@pidgin.im>
parents:
26215
diff
changeset
|
472 | 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
|
473 | : 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
|
474 | else |
|
26226
dcb05990f479
Make FsStreamDirection and FsMediaType conversion functions static.
Michael Ruprecht <maiku@pidgin.im>
parents:
26215
diff
changeset
|
475 | 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
|
476 | : 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
|
477 | |
|
26286
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26266
diff
changeset
|
478 | params = |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26266
diff
changeset
|
479 | jingle_get_params(jingle_session_get_js(session), &num_params); |
|
26147
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
480 | purple_media_add_stream(media, name, remote_jid, |
|
26286
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26266
diff
changeset
|
481 | type, 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
|
482 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
483 | g_free(name); |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
484 | 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
|
485 | 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
|
486 | 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
|
487 | 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
|
488 | 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
|
489 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
490 | return TRUE; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
491 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
492 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
493 | static GList * |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
494 | 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
|
495 | { |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
496 | GList *codecs = NULL; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
497 | 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
|
498 | 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
|
499 | PurpleMediaCodec *codec; |
|
26147
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
500 | 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
|
501 | PurpleMediaSessionType type = |
|
f91c96072586
Wrap FsCodec and remove the Farsight2 include from media.h.
Michael Ruprecht <maiku@pidgin.im>
parents:
26229
diff
changeset
|
502 | !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
|
503 | !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
|
504 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
505 | 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
|
506 | codec_element ; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
507 | 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
|
508 | xmlnode *param; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
509 | gchar *codec_str; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
510 | 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
|
511 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
512 | 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
|
513 | 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
|
514 | |
|
26232
f91c96072586
Wrap FsCodec and remove the Farsight2 include from media.h.
Michael Ruprecht <maiku@pidgin.im>
parents:
26229
diff
changeset
|
515 | 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
|
516 | type, |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
517 | 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
|
518 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
519 | 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
|
520 | 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
|
521 | 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
|
522 | 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
|
523 | 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
|
524 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
525 | |
|
26232
f91c96072586
Wrap FsCodec and remove the Farsight2 include from media.h.
Michael Ruprecht <maiku@pidgin.im>
parents:
26229
diff
changeset
|
526 | 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
|
527 | 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
|
528 | 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
|
529 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
530 | 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
|
531 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
532 | return codecs; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
533 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
534 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
535 | static JingleContent * |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
536 | 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
|
537 | { |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
538 | 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
|
539 | 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
|
540 | 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
|
541 | 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
|
542 | 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
|
543 | 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
|
544 | if (ssrc != NULL) |
|
4cf4d5dcc183
Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents:
26404
diff
changeset
|
545 | 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
|
546 | return content; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
547 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
548 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
549 | static void |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
550 | 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
|
551 | { |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
552 | 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
|
553 | PurpleMediaCodec *codec = (PurpleMediaCodec*)codecs->data; |
|
26147
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
554 | GList *iter = codec->optional_params; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
555 | char id[8], clockrate[10], channels[10]; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
556 | gchar *codec_str; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
557 | 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
|
558 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
559 | g_snprintf(id, sizeof(id), "%d", codec->id); |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
560 | g_snprintf(clockrate, sizeof(clockrate), "%d", codec->clock_rate); |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
561 | g_snprintf(channels, sizeof(channels), "%d", codec->channels); |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
562 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
563 | xmlnode_set_attrib(payload, "name", codec->encoding_name); |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
564 | 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
|
565 | 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
|
566 | 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
|
567 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
568 | for (; iter; iter = g_list_next(iter)) { |
|
26232
f91c96072586
Wrap FsCodec and remove the Farsight2 include from media.h.
Michael Ruprecht <maiku@pidgin.im>
parents:
26229
diff
changeset
|
569 | PurpleMediaCodecParameter *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
|
570 | xmlnode *param = xmlnode_new_child(payload, "parameter"); |
|
26232
f91c96072586
Wrap FsCodec and remove the Farsight2 include from media.h.
Michael Ruprecht <maiku@pidgin.im>
parents:
26229
diff
changeset
|
571 | xmlnode_set_attrib(param, "name", mparam->name); |
|
f91c96072586
Wrap FsCodec and remove the Farsight2 include from media.h.
Michael Ruprecht <maiku@pidgin.im>
parents:
26229
diff
changeset
|
572 | 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
|
573 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
574 | |
|
26232
f91c96072586
Wrap FsCodec and remove the Farsight2 include from media.h.
Michael Ruprecht <maiku@pidgin.im>
parents:
26229
diff
changeset
|
575 | 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
|
576 | 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
|
577 | 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
|
578 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
579 | } |
|
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 | static xmlnode * |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
582 | 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
|
583 | { |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
584 | 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
|
585 | 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
|
586 | if (description != NULL) { |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
587 | 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
|
588 | 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
|
589 | 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
|
590 | 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
|
591 | 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
|
592 | 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
|
593 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
594 | 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
|
595 | |
|
26405
4cf4d5dcc183
Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents:
26404
diff
changeset
|
596 | if (ssrc != NULL) |
|
4cf4d5dcc183
Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents:
26404
diff
changeset
|
597 | xmlnode_set_attrib(description, "ssrc", ssrc); |
|
4cf4d5dcc183
Add ssrc property to JingleRtp.
Michael Ruprecht <maiku@pidgin.im>
parents:
26404
diff
changeset
|
598 | |
|
26147
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
599 | 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
|
600 | g_free(name); |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
601 | 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
|
602 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
603 | jingle_rtp_add_payloads(description, codecs); |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
604 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
605 | return node; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
606 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
607 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
608 | static void |
|
26149
92b095c37277
Fix support for audio and video (at the same time) sessions.
Michael Ruprecht <maiku@pidgin.im>
parents:
26147
diff
changeset
|
609 | 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
|
610 | { |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
611 | switch (action) { |
|
26407
48782a6424e0
Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26405
diff
changeset
|
612 | 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
|
613 | 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
|
614 | 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
|
615 | JingleTransport *transport = jingle_transport_parse( |
|
78fa18d44718
Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents:
26149
diff
changeset
|
616 | 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
|
617 | 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
|
618 | 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
|
619 | 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
|
620 | 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
|
621 | gchar *remote_jid = |
|
48782a6424e0
Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26405
diff
changeset
|
622 | jingle_session_get_remote_jid(session); |
|
48782a6424e0
Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26405
diff
changeset
|
623 | PurpleMedia *media; |
|
26147
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
624 | |
|
26407
48782a6424e0
Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26405
diff
changeset
|
625 | if (action == JINGLE_SESSION_INITIATE && |
|
48782a6424e0
Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26405
diff
changeset
|
626 | 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
|
627 | /* XXX: send error */ |
|
26404
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26330
diff
changeset
|
628 | 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
|
629 | 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
|
630 | 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
|
631 | break; |
|
1ba69535986d
Fix crash when remote client reconnects and tries to restart the media session.
Michael Ruprecht <maiku@pidgin.im>
parents:
26154
diff
changeset
|
632 | } |
|
26147
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
633 | |
|
26407
48782a6424e0
Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26405
diff
changeset
|
634 | media = jingle_rtp_get_media(session); |
|
48782a6424e0
Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26405
diff
changeset
|
635 | purple_media_set_remote_codecs(media, |
|
48782a6424e0
Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26405
diff
changeset
|
636 | name, remote_jid, codecs); |
|
48782a6424e0
Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26405
diff
changeset
|
637 | purple_media_add_remote_candidates(media, |
|
48782a6424e0
Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26405
diff
changeset
|
638 | 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
|
639 | |
|
26407
48782a6424e0
Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26405
diff
changeset
|
640 | /* This needs to be for the entire session, not a single content */ |
|
48782a6424e0
Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26405
diff
changeset
|
641 | /* very hacky */ |
|
48782a6424e0
Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26405
diff
changeset
|
642 | if (action == JINGLE_SESSION_ACCEPT && |
|
48782a6424e0
Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26405
diff
changeset
|
643 | xmlnode_get_next_twin(xmlcontent) == NULL) |
|
48782a6424e0
Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26405
diff
changeset
|
644 | purple_media_accept(media); |
|
26147
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
645 | |
|
26407
48782a6424e0
Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26405
diff
changeset
|
646 | g_free(remote_jid); |
|
48782a6424e0
Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26405
diff
changeset
|
647 | 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
|
648 | 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
|
649 | break; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
650 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
651 | 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
|
652 | 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
|
653 | 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
|
654 | |
|
ca6d9f19c4b6
Remove PurpleMedias from JabberStream's list when a media session ends.
Michael Ruprecht <maiku@pidgin.im>
parents:
26191
diff
changeset
|
655 | 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
|
656 | 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
|
657 | } |
|
ca6d9f19c4b6
Remove PurpleMedias from JabberStream's list when a media session ends.
Michael Ruprecht <maiku@pidgin.im>
parents:
26191
diff
changeset
|
658 | |
|
26147
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
659 | 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
|
660 | break; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
661 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
662 | 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
|
663 | 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
|
664 | JingleTransport *transport = jingle_transport_parse( |
|
78fa18d44718
Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents:
26149
diff
changeset
|
665 | xmlnode_get_child(xmlcontent, "transport")); |
|
78fa18d44718
Update Jingle raw-udp to latest spec version.
Michael Ruprecht <maiku@pidgin.im>
parents:
26149
diff
changeset
|
666 | 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
|
667 | 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
|
668 | gchar *remote_jid = |
|
48782a6424e0
Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26405
diff
changeset
|
669 | 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
|
670 | |
|
26407
48782a6424e0
Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26405
diff
changeset
|
671 | purple_media_add_remote_candidates( |
|
48782a6424e0
Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26405
diff
changeset
|
672 | jingle_rtp_get_media(session), |
|
48782a6424e0
Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26405
diff
changeset
|
673 | name, remote_jid, candidates); |
|
48782a6424e0
Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26405
diff
changeset
|
674 | |
|
48782a6424e0
Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26405
diff
changeset
|
675 | g_free(remote_jid); |
|
48782a6424e0
Update Jingle Ice-Udp according to the XEP.
Michael Ruprecht <maiku@pidgin.im>
parents:
26405
diff
changeset
|
676 | 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
|
677 | 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
|
678 | break; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
679 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
680 | default: |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
681 | break; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
682 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
683 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
684 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
685 | PurpleMedia * |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
686 | 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
|
687 | PurpleMediaSessionType type) |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
688 | { |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
689 | /* create content negotiation */ |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
690 | JingleSession *session; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
691 | JingleContent *content; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
692 | JingleTransport *transport; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
693 | JabberBuddy *jb; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
694 | JabberBuddyResource *jbr; |
|
26161
7fb369b925b5
Fix a few GLib warnings when trying to start a second media session.
Michael Ruprecht <maiku@pidgin.im>
parents:
26160
diff
changeset
|
695 | PurpleMedia *media; |
|
26170
829055c78478
Choose the transport type according to the responder's caps.
Michael Ruprecht <maiku@pidgin.im>
parents:
26166
diff
changeset
|
696 | 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
|
697 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
698 | gchar *jid = NULL, *me = NULL, *sid = NULL; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
699 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
700 | /* 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
|
701 | 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
|
702 | if (!jb) { |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
703 | purple_debug_error("jingle-rtp", "Could not find Jabber buddy\n"); |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
704 | return NULL; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
705 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
706 | jbr = jabber_buddy_find_resource(jb, NULL); |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
707 | if (!jbr) { |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
708 | 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
|
709 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
710 | |
|
26170
829055c78478
Choose the transport type according to the responder's caps.
Michael Ruprecht <maiku@pidgin.im>
parents:
26166
diff
changeset
|
711 | 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
|
712 | 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
|
713 | } 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
|
714 | 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
|
715 | } else { |
|
829055c78478
Choose the transport type according to the responder's caps.
Michael Ruprecht <maiku@pidgin.im>
parents:
26166
diff
changeset
|
716 | 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
|
717 | "the same transport types\n"); |
|
829055c78478
Choose the transport type according to the responder's caps.
Michael Ruprecht <maiku@pidgin.im>
parents:
26166
diff
changeset
|
718 | return NULL; |
|
829055c78478
Choose the transport type according to the responder's caps.
Michael Ruprecht <maiku@pidgin.im>
parents:
26166
diff
changeset
|
719 | } |
|
829055c78478
Choose the transport type according to the responder's caps.
Michael Ruprecht <maiku@pidgin.im>
parents:
26166
diff
changeset
|
720 | |
|
26147
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
721 | if ((strchr(who, '/') == NULL) && jbr && (jbr->name != NULL)) { |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
722 | jid = g_strdup_printf("%s/%s", who, jbr->name); |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
723 | } else { |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
724 | jid = g_strdup(who); |
|
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 | /* 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
|
728 | 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
|
729 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
730 | sid = jabber_get_next_id(js); |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
731 | session = jingle_session_create(js, sid, me, jid, TRUE); |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
732 | g_free(sid); |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
733 | |
|
26149
92b095c37277
Fix support for audio and video (at the same time) sessions.
Michael Ruprecht <maiku@pidgin.im>
parents:
26147
diff
changeset
|
734 | |
|
92b095c37277
Fix support for audio and video (at the same time) sessions.
Michael Ruprecht <maiku@pidgin.im>
parents:
26147
diff
changeset
|
735 | 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
|
736 | 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
|
737 | 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
|
738 | "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
|
739 | 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
|
740 | 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
|
741 | 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
|
742 | } |
|
92b095c37277
Fix support for audio and video (at the same time) sessions.
Michael Ruprecht <maiku@pidgin.im>
parents:
26147
diff
changeset
|
743 | 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
|
744 | 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
|
745 | 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
|
746 | "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
|
747 | 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
|
748 | 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
|
749 | 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
|
750 | } |
|
26147
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
751 | |
|
26161
7fb369b925b5
Fix a few GLib warnings when trying to start a second media session.
Michael Ruprecht <maiku@pidgin.im>
parents:
26160
diff
changeset
|
752 | if ((media = jingle_rtp_get_media(session)) == NULL) { |
|
7fb369b925b5
Fix a few GLib warnings when trying to start a second media session.
Michael Ruprecht <maiku@pidgin.im>
parents:
26160
diff
changeset
|
753 | return NULL; |
|
7fb369b925b5
Fix a few GLib warnings when trying to start a second media session.
Michael Ruprecht <maiku@pidgin.im>
parents:
26160
diff
changeset
|
754 | } |
|
7fb369b925b5
Fix a few GLib warnings when trying to start a second media session.
Michael Ruprecht <maiku@pidgin.im>
parents:
26160
diff
changeset
|
755 | |
|
26147
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
756 | g_free(jid); |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
757 | g_free(me); |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
758 | |
|
26161
7fb369b925b5
Fix a few GLib warnings when trying to start a second media session.
Michael Ruprecht <maiku@pidgin.im>
parents:
26160
diff
changeset
|
759 | return media; |
|
26147
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
760 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
761 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
762 | void |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
763 | 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
|
764 | { |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
765 | JingleSession *session; |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
766 | /* 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
|
767 | 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
|
768 | |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
769 | if (session) { |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
770 | 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
|
771 | if (media) { |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
772 | purple_debug_info("jingle-rtp", "hanging up media\n"); |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
773 | purple_media_hangup(media); |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
774 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
775 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
776 | } |
|
791ee9c9a75e
Add files I missed committing before and remove a few unnecessary functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
777 | |
|
26215
9ecaa256d77b
Fix compiling with --disable-vv.
Michael Ruprecht <maiku@pidgin.im>
parents:
26198
diff
changeset
|
778 | #endif /* USE_VV */ |
|
9ecaa256d77b
Fix compiling with --disable-vv.
Michael Ruprecht <maiku@pidgin.im>
parents:
26198
diff
changeset
|
779 |