annotate libpurple/protocols/jabber/jingle.c @ 25681:6268758d029a

Send negotiated codecs in session-accept opposed to all local codecs.
author Mike Ruprecht <maiku@soc.pidgin.im>
date Sat, 07 Jun 2008 03:43:45 +0000
parents b5a00ddb7077
children bdc09d3164df
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
1 /*
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
2 * purple - Jabber Protocol Plugin
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
3 *
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
4 * This program is free software; you can redistribute it and/or modify
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
5 * it under the terms of the GNU General Public License as published by
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
7 * (at your option) any later version.
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
8 *
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
9 * This program is distributed in the hope that it will be useful,
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
12 * GNU General Public License for more details.
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
13 *
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
14 * You should have received a copy of the GNU General Public License
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
15 * along with this program; if not, write to the Free Software
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
16 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
17 *
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
18 */
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
19
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
20 #include "config.h"
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
21 #include "purple.h"
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
22 #include "jingle.h"
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
23 #include "xmlnode.h"
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
24 #include "iq.h"
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
25
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
26 #include <stdlib.h>
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
27 #include <string.h>
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
28 #include <glib.h>
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
29
25654
cbe97caec684 Use USE_VV instead of USE_FARSIGHT.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25648
diff changeset
30 #ifdef USE_VV
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
31
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
32 #include <gst/farsight/fs-candidate.h>
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
33
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
34 #define JINGLE "urn:xmpp:tmp:jingle"
25675
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
35 #define JINGLE_RTP "urn:xmpp:tmp:jingle:apps:rtp"
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
36 #define JINGLE_RTP_INFO "urn:xmpp:tmp:jingle:apps:rtp:info"
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
37 #define TRANSPORT_ICEUDP "urn:xmpp:tmp:jingle:transports:ice-udp"
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
38
25680
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
39 typedef enum {
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
40 PENDING,
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
41 GOT_ACK,
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
42 ACCEPTED,
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
43 ACTIVE
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
44 } JingleSessionState;
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
45
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
46 typedef struct {
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
47 char *id;
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
48 JabberStream *js;
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
49 PurpleMedia *media;
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
50 char *remote_jid;
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
51 char *initiator;
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
52 gboolean is_initiator;
25680
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
53 JingleSessionState state;
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
54 GHashTable *contents; /* JingleSessionContent table */
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
55 } JingleSession;
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
56
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
57 typedef struct {
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
58 gchar *name;
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
59 JingleSession *session;
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
60 gchar *creator;
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
61 gchar *sender;
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
62 gchar *transport_type;
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
63 gchar *type;
25675
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
64 gchar *subtype;
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
65 } JingleSessionContent;
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
66
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
67 static void
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
68 jabber_jingle_session_content_create_internal(JingleSession *session,
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
69 const gchar *name,
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
70 const gchar *creator,
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
71 const gchar *sender,
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
72 const gchar *transport_type,
25675
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
73 const gchar *type,
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
74 const gchar *subtype)
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
75 {
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
76 JingleSessionContent *content = g_new0(JingleSessionContent, 1);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
77 content->session = session;
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
78 content->name = g_strdup(name);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
79 content->creator = g_strdup(creator);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
80 content->sender = g_strdup(sender);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
81 content->transport_type = g_strdup(transport_type);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
82 content->type = g_strdup(type);
25675
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
83 content->subtype = g_strdup(subtype);
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
84
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
85 if (!session->contents) {
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
86 purple_debug_info("jingle", "Creating hash table for contents\n");
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
87 session->contents = g_hash_table_new(g_str_hash, g_str_equal);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
88 }
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
89 purple_debug_info("jingle", "inserting content with name == \"%s\" into table\n",
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
90 content->name);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
91 g_hash_table_insert(session->contents, content->name, content);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
92 }
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
93
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
94 static void
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
95 jabber_jingle_session_destroy_content(JingleSessionContent *content)
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
96 {
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
97 purple_debug_info("jingle", "destroying content with name == \"%s\"\n",
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
98 content->name);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
99 g_hash_table_remove(content->session->contents, content->name);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
100 g_free(content->name);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
101 g_free(content->creator);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
102 g_free(content->sender);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
103 g_free(content->transport_type);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
104 g_free(content->type);
25675
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
105 g_free(content->subtype);
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
106 g_free(content);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
107 }
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
108
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
109 static const gchar *
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
110 jabber_jingle_session_content_get_name(const JingleSessionContent *jsc)
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
111 {
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
112 return jsc->name;
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
113 }
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
114
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
115 static JingleSession *
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
116 jabber_jingle_session_content_get_session(const JingleSessionContent *jsc)
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
117 {
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
118 return jsc->session;
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
119 }
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
120
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
121 static const gchar *
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
122 jabber_jingle_session_content_get_creator(const JingleSessionContent *jsc)
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
123 {
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
124 return jsc->creator;
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
125 }
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
126
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
127 static const gchar *
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
128 jabber_jingle_session_content_get_sender(const JingleSessionContent *jsc)
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
129 {
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
130 return jsc->sender;
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
131 }
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
132
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
133 static const gchar *
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
134 jabber_jingle_session_content_get_transport_type(const JingleSessionContent *jsc)
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
135 {
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
136 return jsc->transport_type;
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
137 }
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
138
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
139 static gboolean
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
140 jabber_jingle_session_content_is_transport_type(const JingleSessionContent *jsc,
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
141 const gchar *transport_type)
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
142 {
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
143 return !strcmp(jabber_jingle_session_content_get_transport_type(jsc),
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
144 transport_type);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
145 }
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
146
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
147 static const gchar *
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
148 jabber_jingle_session_content_get_type(const JingleSessionContent *jsc)
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
149 {
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
150 return jsc->type;
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
151 }
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
152
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
153 static gboolean
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
154 jabber_jingle_session_content_is_type(const JingleSessionContent *jsc,
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
155 const gchar *type)
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
156 {
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
157 return !strcmp(jabber_jingle_session_content_get_type(jsc), type);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
158 }
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
159
25675
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
160 static gchar *
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
161 jabber_jingle_session_content_get_subtype(const JingleSessionContent *jsc)
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
162 {
25675
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
163 return jsc->subtype;
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
164 }
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
165
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
166 static gboolean
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
167 jabber_jingle_session_content_is_vv_type(const JingleSessionContent *jsc,
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
168 const gchar *media_type)
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
169 {
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
170 return jabber_jingle_session_content_is_type(jsc, JINGLE_RTP) &&
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
171 !strcmp(jabber_jingle_session_content_get_subtype(jsc),
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
172 media_type);
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
173 }
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
174
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
175 static void
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
176 jabber_jingle_session_content_set_sender(JingleSessionContent *jsc,
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
177 const char *sender)
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
178 {
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
179 if (jsc->sender)
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
180 g_free(jsc->sender);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
181 jsc->sender = g_strdup(sender);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
182 }
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
183
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
184 static gboolean
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
185 jabber_jingle_session_equal(gconstpointer a, gconstpointer b)
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
186 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
187 purple_debug_info("jingle",
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
188 "jabber_jingle_session_equal, comparing %s and %s\n",
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
189 ((JingleSession *)a)->id,
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
190 ((JingleSession *)b)->id);
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
191 return !strcmp(((JingleSession *) a)->id, ((JingleSession *) b)->id);
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
192 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
193
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
194 static JingleSession *
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
195 jabber_jingle_session_create_internal(JabberStream *js,
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
196 const char *id)
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
197 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
198 JingleSession *sess = g_new0(JingleSession, 1);
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
199 sess->js = js;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
200
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
201 if (id) {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
202 sess->id = g_strdup(id);
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
203 } else if (js) {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
204 /* init the session ID... */
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
205 sess->id = jabber_get_next_id(js);
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
206 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
207
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
208 /* insert it into the hash table */
25648
16543025aed1 Moved jingle.c global variable "sessions" into JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25647
diff changeset
209 if (!js->sessions) {
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
210 purple_debug_info("jingle", "Creating hash table for sessions\n");
25648
16543025aed1 Moved jingle.c global variable "sessions" into JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25647
diff changeset
211 js->sessions = g_hash_table_new(g_str_hash, g_str_equal);
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
212 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
213 purple_debug_info("jingle", "inserting session with key: %s into table\n",
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
214 sess->id);
25648
16543025aed1 Moved jingle.c global variable "sessions" into JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25647
diff changeset
215 g_hash_table_insert(js->sessions, sess->id, sess);
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
216
25680
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
217 sess->state = PENDING;
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
218
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
219 return sess;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
220 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
221
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
222 static JabberStream *
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
223 jabber_jingle_session_get_js(const JingleSession *sess)
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
224 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
225 return sess->js;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
226 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
227
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
228 static JingleSession *
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
229 jabber_jingle_session_create(JabberStream *js)
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
230 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
231 JingleSession *sess = jabber_jingle_session_create_internal(js, NULL);
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
232 sess->is_initiator = TRUE;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
233 return sess;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
234 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
235
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
236 static JingleSession *
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
237 jabber_jingle_session_create_by_id(JabberStream *js, const char *id)
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
238 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
239 JingleSession *sess = jabber_jingle_session_create_internal(js, id);
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
240 sess->is_initiator = FALSE;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
241 return sess;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
242 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
243
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
244 static const char *
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
245 jabber_jingle_session_get_id(const JingleSession *sess)
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
246 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
247 return sess->id;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
248 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
249
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
250 static void
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
251 jabber_jingle_session_destroy(JingleSession *sess)
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
252 {
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
253 GList *contents = g_hash_table_get_values(sess->contents);
25648
16543025aed1 Moved jingle.c global variable "sessions" into JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25647
diff changeset
254 g_hash_table_remove(sess->js->sessions, sess->id);
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
255 g_free(sess->id);
25661
d048100a43ab Free the PurpleMedia object when the media session ends and fix ending
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25654
diff changeset
256 g_object_unref(sess->media);
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
257
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
258 for (; contents; contents = contents->next)
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
259 jabber_jingle_session_destroy_content(contents->data);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
260
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
261 g_list_free(contents);
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
262 g_free(sess);
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
263 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
264
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
265 static JingleSession *
25648
16543025aed1 Moved jingle.c global variable "sessions" into JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25647
diff changeset
266 jabber_jingle_session_find_by_id(JabberStream *js, const char *id)
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
267 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
268 purple_debug_info("jingle", "find_by_id %s\n", id);
25648
16543025aed1 Moved jingle.c global variable "sessions" into JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25647
diff changeset
269 purple_debug_info("jingle", "hash table: %p\n", js->sessions);
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
270 purple_debug_info("jingle", "hash table size %d\n",
25648
16543025aed1 Moved jingle.c global variable "sessions" into JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25647
diff changeset
271 g_hash_table_size(js->sessions));
16543025aed1 Moved jingle.c global variable "sessions" into JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25647
diff changeset
272 purple_debug_info("jingle", "lookup: %p\n", g_hash_table_lookup(js->sessions, id));
16543025aed1 Moved jingle.c global variable "sessions" into JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25647
diff changeset
273 return (JingleSession *) g_hash_table_lookup(js->sessions, id);
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
274 }
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
275
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
276 static JingleSession *
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
277 jabber_jingle_session_find_by_jid(JabberStream *js, const char *jid)
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
278 {
25648
16543025aed1 Moved jingle.c global variable "sessions" into JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25647
diff changeset
279 GList *values = g_hash_table_get_values(js->sessions);
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
280 GList *iter = values;
25661
d048100a43ab Free the PurpleMedia object when the media session ends and fix ending
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25654
diff changeset
281 gboolean use_bare = strchr(jid, '/') == NULL;
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
282
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
283 for (; iter; iter = iter->next) {
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
284 JingleSession *session = (JingleSession *)iter->data;
25661
d048100a43ab Free the PurpleMedia object when the media session ends and fix ending
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25654
diff changeset
285 gchar *cmp_jid = use_bare ? jabber_get_bare_jid(session->remote_jid)
d048100a43ab Free the PurpleMedia object when the media session ends and fix ending
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25654
diff changeset
286 : g_strdup(session->remote_jid);
d048100a43ab Free the PurpleMedia object when the media session ends and fix ending
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25654
diff changeset
287 if (!strcmp(jid, cmp_jid)) {
d048100a43ab Free the PurpleMedia object when the media session ends and fix ending
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25654
diff changeset
288 g_free(cmp_jid);
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
289 g_list_free(values);
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
290 return session;
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
291 }
25661
d048100a43ab Free the PurpleMedia object when the media session ends and fix ending
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25654
diff changeset
292 g_free(cmp_jid);
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
293 }
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
294
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
295 g_list_free(values);
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
296 return NULL;
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
297 }
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
298
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
299 static GList *
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
300 jabber_jingle_get_codecs(xmlnode *description)
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
301 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
302 GList *codecs = NULL;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
303 xmlnode *codec_element = NULL;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
304 const char *encoding_name,*id, *clock_rate;
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
305 FsCodec *codec;
25675
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
306 const gchar *media = xmlnode_get_attrib(description, "media");
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
307 FsMediaType type = !strcmp(media, "video") ? FS_MEDIA_TYPE_VIDEO :
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
308 !strcmp(media, "audio") ? FS_MEDIA_TYPE_AUDIO :
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
309 FS_MEDIA_TYPE_APPLICATION;
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
310
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
311 for (codec_element = xmlnode_get_child(description, "payload-type") ;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
312 codec_element ;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
313 codec_element = xmlnode_get_next_twin(codec_element)) {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
314 encoding_name = xmlnode_get_attrib(codec_element, "name");
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
315
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
316 id = xmlnode_get_attrib(codec_element, "id");
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
317 clock_rate = xmlnode_get_attrib(codec_element, "clockrate");
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
318
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
319 codec = fs_codec_new(atoi(id), encoding_name,
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
320 type,
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
321 clock_rate ? atoi(clock_rate) : 0);
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
322 purple_debug_info("jingle", "codec: %i, %s, %s, %i\n", codec->id,
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
323 codec->encoding_name, codec->media_type == FS_MEDIA_TYPE_AUDIO ?
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
324 "FS_MEDIA_TYPE_AUDIO" : codec->media_type == FS_MEDIA_TYPE_VIDEO ?
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
325 "FS_MEDIA_TYPE_VIDEO" : "FS_MEDIA_TYPE_NONE", codec->clock_rate);
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
326 codecs = g_list_append(codecs, codec);
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
327 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
328 return codecs;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
329 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
330
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
331 static GList *
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
332 jabber_jingle_get_candidates(const xmlnode *transport)
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
333 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
334 GList *candidates = NULL;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
335 xmlnode *candidate = NULL;
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
336 FsCandidate *c;
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
337
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
338 for (candidate = xmlnode_get_child(transport, "candidate") ;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
339 candidate ;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
340 candidate = xmlnode_get_next_twin(candidate)) {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
341 const char *type = xmlnode_get_attrib(candidate, "type");
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
342 c = fs_candidate_new(xmlnode_get_attrib(candidate, "component"),
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
343 atoi(xmlnode_get_attrib(candidate, "component")),
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
344 strcmp(type, "host") == 0 ?
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
345 FS_CANDIDATE_TYPE_HOST :
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
346 strcmp(type, "prflx") == 0 ?
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
347 FS_CANDIDATE_TYPE_PRFLX :
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
348 strcmp(type, "relay") == 0 ?
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
349 FS_CANDIDATE_TYPE_RELAY :
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
350 strcmp(type, "srflx") == 0 ?
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
351 FS_CANDIDATE_TYPE_SRFLX : 0,
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
352 strcmp(xmlnode_get_attrib(candidate, "protocol"),
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
353 "udp") == 0 ?
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
354 FS_NETWORK_PROTOCOL_UDP :
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
355 FS_NETWORK_PROTOCOL_TCP,
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
356 xmlnode_get_attrib(candidate, "ip"),
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
357 atoi(xmlnode_get_attrib(candidate, "port")));
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
358 candidates = g_list_append(candidates, c);
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
359 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
360
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
361 return candidates;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
362 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
363
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
364 static JingleSessionContent *
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
365 jabber_jingle_session_get_content(const JingleSession *session,
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
366 const char *name)
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
367 {
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
368 return (JingleSession *) name ?
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
369 g_hash_table_lookup(session->contents, name) : NULL;
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
370 }
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
371
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
372 static GList *
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
373 jabber_jingle_session_get_contents(const JingleSession *session)
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
374 {
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
375 return g_hash_table_get_values(session->contents);
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
376 }
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
377
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
378 static PurpleMedia *
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
379 jabber_jingle_session_get_media(const JingleSession *sess)
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
380 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
381 return sess->media;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
382 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
383
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
384 static void
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
385 jabber_jingle_session_set_media(JingleSession *sess, PurpleMedia *media)
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
386 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
387 sess->media = media;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
388 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
389
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
390 static const char *
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
391 jabber_jingle_session_get_remote_jid(const JingleSession *sess)
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
392 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
393 return sess->remote_jid;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
394 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
395
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
396 static void
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
397 jabber_jingle_session_set_remote_jid(JingleSession *sess,
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
398 const char *remote_jid)
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
399 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
400 sess->remote_jid = strdup(remote_jid);
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
401 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
402
25680
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
403 static JingleSessionState
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
404 jabber_jingle_session_get_state(JingleSession *sess)
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
405 {
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
406 return sess->state;
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
407 }
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
408
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
409 static void
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
410 jabber_jingle_session_set_state(JingleSession *sess,
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
411 JingleSessionState state)
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
412 {
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
413 sess->state = state;
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
414 }
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
415
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
416
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
417 static const char *
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
418 jabber_jingle_session_get_initiator(const JingleSession *sess)
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
419 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
420 return sess->initiator;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
421 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
422
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
423 static void
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
424 jabber_jingle_session_set_initiator(JingleSession *sess,
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
425 const char *initiator)
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
426 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
427 sess->initiator = g_strdup(initiator);
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
428 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
429
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
430 static gboolean
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
431 jabber_jingle_session_is_initiator(const JingleSession *sess)
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
432 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
433 return sess->is_initiator;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
434 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
435
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
436 static void
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
437 jabber_jingle_session_add_payload_types(const JingleSessionContent *jsc,
25681
6268758d029a Send negotiated codecs in session-accept opposed to all local codecs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25680
diff changeset
438 xmlnode *description,
6268758d029a Send negotiated codecs in session-accept opposed to all local codecs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25680
diff changeset
439 GList *codecs)
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
440 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
441 for (; codecs ; codecs = codecs->next) {
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
442 FsCodec *codec = (FsCodec*)codecs->data;
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
443 char id[8], clockrate[10], channels[10];
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
444 xmlnode *payload = xmlnode_new_child(description, "payload-type");
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
445
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
446 g_snprintf(id, sizeof(id), "%d", codec->id);
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
447 g_snprintf(clockrate, sizeof(clockrate), "%d", codec->clock_rate);
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
448 g_snprintf(channels, sizeof(channels), "%d", codec->channels);
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
449
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
450 xmlnode_set_attrib(payload, "name", codec->encoding_name);
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
451 xmlnode_set_attrib(payload, "id", id);
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
452 xmlnode_set_attrib(payload, "clockrate", clockrate);
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
453 xmlnode_set_attrib(payload, "channels", channels);
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
454 }
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
455 }
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
456
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
457 static xmlnode *
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
458 jabber_jingle_session_add_description_vv(const JingleSessionContent *jsc,
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
459 xmlnode *description)
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
460 {
25675
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
461 xmlnode_set_attrib(description, "media",
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
462 jabber_jingle_session_content_get_subtype(jsc));
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
463 xmlnode_set_attrib(description, "profile", "RTP/AVP");
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
464 return description;
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
465 }
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
466
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
467 static xmlnode *
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
468 jabber_jingle_session_add_description(const JingleSessionContent *jsc,
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
469 xmlnode *content)
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
470 {
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
471 xmlnode *description = xmlnode_new_child(content, "description");
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
472 xmlnode_set_namespace(description,
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
473 jabber_jingle_session_content_get_type(jsc));
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
474
25675
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
475 if (jabber_jingle_session_content_is_type(jsc, JINGLE_RTP))
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
476 return jabber_jingle_session_add_description_vv(jsc, description);
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
477 else
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
478 return description;
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
479 }
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
480
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
481 static xmlnode *
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
482 jabber_jingle_session_add_candidate_iceudp(xmlnode *transport,
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
483 FsCandidate *c,
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
484 FsCandidate *remote)
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
485 {
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
486 char port[8];
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
487 char prio[8];
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
488 char component[8];
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
489 xmlnode *candidate = xmlnode_new_child(transport, "candidate");
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
490
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
491 g_snprintf(port, sizeof(port), "%d", c->port);
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
492 g_snprintf(prio, sizeof(prio), "%d", c->priority);
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
493 g_snprintf(component, sizeof(component), "%d", c->component_id);
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
494
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
495 xmlnode_set_attrib(candidate, "component", component);
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
496 xmlnode_set_attrib(candidate, "foundation", "1"); /* what about this? */
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
497 xmlnode_set_attrib(candidate, "generation", "0"); /* ? */
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
498 xmlnode_set_attrib(candidate, "ip", c->ip);
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
499 xmlnode_set_attrib(candidate, "network", "0"); /* ? */
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
500 xmlnode_set_attrib(candidate, "port", port);
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
501 xmlnode_set_attrib(candidate, "priority", prio); /* Is this correct? */
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
502 xmlnode_set_attrib(candidate, "protocol",
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
503 c->proto == FS_NETWORK_PROTOCOL_UDP ?
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
504 "udp" : "tcp");
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
505 if (c->username)
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
506 xmlnode_set_attrib(transport, "ufrag", c->username);
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
507 if (c->password)
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
508 xmlnode_set_attrib(transport, "pwd", c->password);
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
509
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
510 xmlnode_set_attrib(candidate, "type",
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
511 c->type == FS_CANDIDATE_TYPE_HOST ?
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
512 "host" :
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
513 c->type == FS_CANDIDATE_TYPE_PRFLX ?
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
514 "prflx" :
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
515 c->type == FS_CANDIDATE_TYPE_RELAY ?
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
516 "relay" :
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
517 c->type == FS_CANDIDATE_TYPE_SRFLX ?
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
518 "srflx" : NULL);
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
519
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
520 /* relay */
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
521 if (c->type == FS_CANDIDATE_TYPE_RELAY) {
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
522 /* set rel-addr and rel-port? How? */
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
523 }
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
524
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
525 if (remote) {
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
526 char remote_port[8];
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
527 g_snprintf(remote_port, sizeof(remote_port), "%d", remote->port);
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
528 xmlnode_set_attrib(candidate, "rem-addr", remote->ip);
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
529 xmlnode_set_attrib(candidate, "rem-port", remote_port);
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
530 }
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
531
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
532 return candidate;
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
533 }
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
534
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
535 static xmlnode *
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
536 jabber_jingle_session_add_transport(const JingleSessionContent *jsc,
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
537 xmlnode *content)
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
538 {
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
539 xmlnode *transport = xmlnode_new_child(content, "transport");
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
540 const gchar *transport_type = jabber_jingle_session_content_get_transport_type(jsc);
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
541 xmlnode_set_namespace(transport, transport_type);
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
542 return transport;
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
543 }
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
544
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
545 static xmlnode *
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
546 jabber_jingle_session_add_content(const JingleSessionContent *jsc,
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
547 xmlnode *jingle)
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
548 {
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
549 xmlnode *content = xmlnode_new_child(jingle, "content");
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
550 xmlnode_set_attrib(content, "creator",
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
551 jabber_jingle_session_content_get_creator(jsc));
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
552 xmlnode_set_attrib(content, "name",
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
553 jabber_jingle_session_content_get_name(jsc));
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
554 xmlnode_set_attrib(content, "sender",
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
555 jabber_jingle_session_content_get_sender(jsc));
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
556 return content;
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
557 }
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
558
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
559
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
560 static xmlnode *
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
561 jabber_jingle_session_add_jingle(const JingleSession *sess,
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
562 JabberIq *iq, const char *action)
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
563 {
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
564 xmlnode *jingle = iq ? xmlnode_new_child(iq->node, "jingle") :
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
565 xmlnode_new("jingle");
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
566 xmlnode_set_namespace(jingle, JINGLE);
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
567 xmlnode_set_attrib(jingle, "action", action);
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
568 xmlnode_set_attrib(jingle, "initiator",
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
569 jabber_jingle_session_get_initiator(sess));
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
570 if (jabber_jingle_session_is_initiator(sess))
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
571 xmlnode_set_attrib(jingle, "responder",
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
572 jabber_jingle_session_get_remote_jid(sess));
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
573 else {
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
574 gchar *responder = g_strdup_printf("%s@%s/%s",
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
575 sess->js->user->node,
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
576 sess->js->user->domain,
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
577 sess->js->user->resource);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
578 xmlnode_set_attrib(jingle, "responder", responder);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
579 g_free(responder);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
580 }
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
581 xmlnode_set_attrib(jingle, "sid", jabber_jingle_session_get_id(sess));
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
582
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
583 return jingle;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
584 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
585
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
586 static JabberIq *
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
587 jabber_jingle_session_create_ack(JabberStream *js, xmlnode *packet)
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
588 {
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
589 JabberIq *result = jabber_iq_new(js, JABBER_IQ_RESULT);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
590 jabber_iq_set_id(result, xmlnode_get_attrib(packet, "id"));
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
591 xmlnode_set_attrib(result->node, "from", xmlnode_get_attrib(packet, "to"));
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
592 xmlnode_set_attrib(result->node, "to", xmlnode_get_attrib(packet, "from"));
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
593 return result;
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
594 }
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
595
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
596 static JabberIq *
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
597 jabber_jingle_session_create_iq(const JingleSession *session)
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
598 {
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
599 JabberIq *result = jabber_iq_new(jabber_jingle_session_get_js(session),
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
600 JABBER_IQ_SET);
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
601 gchar *from = g_strdup_printf("%s@%s/%s", session->js->user->node,
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
602 session->js->user->domain,
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
603 session->js->user->resource);
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
604 xmlnode_set_attrib(result->node, "from", from);
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
605 g_free(from);
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
606 xmlnode_set_attrib(result->node, "to",
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
607 jabber_jingle_session_get_remote_jid(session));
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
608 return result;
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
609 }
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
610 #if 0
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
611 static xmlnode *
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
612 jabber_jingle_session_create_content_accept(const JingleSession *sess)
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
613 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
614 xmlnode *jingle =
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
615 jabber_jingle_session_add_jingle(sess, NULL, "content-accept");
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
616
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
617 xmlnode *content = xmlnode_new_child(jingle, "content");
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
618 xmlnode *description = jabber_jingle_session_create_description(sess);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
619
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
620 xmlnode_set_attrib(content, "creator", "initiator");
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
621 xmlnode_set_attrib(content, "name", "audio-content");
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
622 xmlnode_set_attrib(content, "profile", "RTP/AVP");
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
623
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
624 xmlnode_insert_child(content, description);
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
625
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
626 return jingle;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
627 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
628
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
629 static xmlnode *
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
630 jabber_jingle_session_create_content_replace(const JingleSession *sess,
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
631 FsCandidate *native_candidate,
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
632 FsCandidate *remote_candidate)
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
633 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
634 xmlnode *jingle =
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
635 jabber_jingle_session_add_jingle(sess, NULL, "content-replace");
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
636 xmlnode *content = NULL;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
637 xmlnode *transport = NULL;
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
638
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
639 purple_debug_info("jingle", "creating content-modify for native candidate %s " \
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
640 ", remote candidate %s\n", native_candidate->candidate_id,
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
641 remote_candidate->candidate_id);
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
642
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
643 content = xmlnode_new_child(jingle, "content");
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
644 xmlnode_set_attrib(content, "creator", "initiator");
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
645 xmlnode_set_attrib(content, "name", "audio-content");
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
646 xmlnode_set_attrib(content, "profile", "RTP/AVP");
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
647
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
648 /* get top codec from codec_intersection to put here... */
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
649 /* later on this should probably handle changing codec */
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
650
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
651 xmlnode_insert_child(content, jabber_jingle_session_create_description(sess));
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
652
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
653 transport = xmlnode_new_child(content, "transport");
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
654 xmlnode_set_namespace(transport, TRANSPORT_ICEUDP);
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
655 jabber_jingle_session_add_candidate_iceudp(transport, native_candidate,
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
656 remote_candidate);
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
657
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
658 purple_debug_info("jingle", "End create content modify\n");
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
659
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
660 return jingle;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
661 }
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
662 #endif
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
663
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
664 static JabberIq *
25680
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
665 jabber_jingle_session_create_session_accept(const JingleSession *session)
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
666 {
25680
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
667 PurpleMedia *media = jabber_jingle_session_get_media(session);
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
668 const gchar *remote_jid = jabber_jingle_session_get_remote_jid(session);
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
669 JabberIq *request = jabber_jingle_session_create_iq(session);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
670 xmlnode *jingle =
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
671 jabber_jingle_session_add_jingle(session, request,
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
672 "session-accept");
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
673 GList *contents = jabber_jingle_session_get_contents(session);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
674
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
675 for (; contents; contents = contents->next) {
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
676 JingleSessionContent *jsc = contents->data;
25681
6268758d029a Send negotiated codecs in session-accept opposed to all local codecs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25680
diff changeset
677 const gchar *content_name = jabber_jingle_session_content_get_name(jsc);
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
678 xmlnode *content = jabber_jingle_session_add_content(jsc, jingle);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
679 xmlnode *description = jabber_jingle_session_add_description(jsc, content);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
680 xmlnode *transport = jabber_jingle_session_add_transport(jsc, content);
25681
6268758d029a Send negotiated codecs in session-accept opposed to all local codecs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25680
diff changeset
681 if (jabber_jingle_session_content_is_type(jsc, JINGLE_RTP)) {
6268758d029a Send negotiated codecs in session-accept opposed to all local codecs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25680
diff changeset
682 GList *codecs = purple_media_get_negotiated_codecs(media,
6268758d029a Send negotiated codecs in session-accept opposed to all local codecs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25680
diff changeset
683 content_name);
6268758d029a Send negotiated codecs in session-accept opposed to all local codecs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25680
diff changeset
684 jabber_jingle_session_add_payload_types(jsc, description, codecs);
6268758d029a Send negotiated codecs in session-accept opposed to all local codecs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25680
diff changeset
685 fs_codec_list_destroy(codecs);
6268758d029a Send negotiated codecs in session-accept opposed to all local codecs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25680
diff changeset
686 }
25680
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
687 if (jabber_jingle_session_content_is_transport_type(jsc, TRANSPORT_ICEUDP)) {
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
688 jabber_jingle_session_add_candidate_iceudp(transport,
25681
6268758d029a Send negotiated codecs in session-accept opposed to all local codecs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25680
diff changeset
689 purple_media_get_local_candidate(media, content_name,
25680
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
690 remote_jid),
25681
6268758d029a Send negotiated codecs in session-accept opposed to all local codecs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25680
diff changeset
691 purple_media_get_remote_candidate(media, content_name,
25680
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
692 remote_jid));
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
693 }
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
694 }
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
695
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
696 return request;
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
697 }
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
698
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
699 static JabberIq *
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
700 jabber_jingle_session_create_session_info(const JingleSession *session,
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
701 const gchar *type)
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
702 {
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
703 JabberIq *request = jabber_jingle_session_create_iq(session);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
704 xmlnode *jingle =
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
705 jabber_jingle_session_add_jingle(session, request,
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
706 "session-info");
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
707 xmlnode *info = xmlnode_new_child(jingle, type);
25675
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
708 xmlnode_set_namespace(info, JINGLE_RTP_INFO);
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
709 return request;
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
710 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
711
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
712 static JabberIq *
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
713 jabber_jingle_session_create_session_initiate(const JingleSession *session)
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
714 {
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
715 JabberIq *request = jabber_jingle_session_create_iq(session);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
716 xmlnode *jingle =
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
717 jabber_jingle_session_add_jingle(session, request,
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
718 "session-initiate");
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
719 GList *contents = jabber_jingle_session_get_contents(session);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
720
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
721 for (; contents; contents = contents->next) {
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
722 JingleSessionContent *jsc = contents->data;
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
723 xmlnode *content = jabber_jingle_session_add_content(jsc, jingle);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
724 xmlnode *description = jabber_jingle_session_add_description(jsc, content);
25681
6268758d029a Send negotiated codecs in session-accept opposed to all local codecs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25680
diff changeset
725 if (jabber_jingle_session_content_is_type(jsc, JINGLE_RTP)) {
6268758d029a Send negotiated codecs in session-accept opposed to all local codecs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25680
diff changeset
726 PurpleMedia *media = jabber_jingle_session_get_media(session);
6268758d029a Send negotiated codecs in session-accept opposed to all local codecs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25680
diff changeset
727 const gchar *content_name =
6268758d029a Send negotiated codecs in session-accept opposed to all local codecs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25680
diff changeset
728 jabber_jingle_session_content_get_name(jsc);
6268758d029a Send negotiated codecs in session-accept opposed to all local codecs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25680
diff changeset
729 GList *codecs = purple_media_get_local_codecs(media, content_name);
6268758d029a Send negotiated codecs in session-accept opposed to all local codecs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25680
diff changeset
730 jabber_jingle_session_add_payload_types(jsc, description, codecs);
6268758d029a Send negotiated codecs in session-accept opposed to all local codecs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25680
diff changeset
731 fs_codec_list_destroy(codecs);
6268758d029a Send negotiated codecs in session-accept opposed to all local codecs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25680
diff changeset
732 }
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
733 jabber_jingle_session_add_transport(jsc, content);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
734 }
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
735
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
736 return request;
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
737 }
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
738
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
739 static JabberIq *
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
740 jabber_jingle_session_create_session_terminate(const JingleSession *sess,
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
741 const char *reasoncode,
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
742 const char *reasontext)
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
743 {
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
744 JabberIq *request = jabber_jingle_session_create_iq(sess);
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
745 xmlnode *jingle =
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
746 jabber_jingle_session_add_jingle(sess, request,
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
747 "session-terminate");
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
748 xmlnode *reason = xmlnode_new_child(jingle, "reason");
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
749 xmlnode *condition = xmlnode_new_child(reason, "condition");
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
750 xmlnode_new_child(condition, reasoncode);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
751 if (reasontext) {
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
752 xmlnode *text = xmlnode_new_child(reason, "text");
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
753 xmlnode_insert_data(text, reasontext, strlen(reasontext));
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
754 }
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
755
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
756 return request;
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
757 }
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
758
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
759 static JabberIq *
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
760 jabber_jingle_session_create_transport_info(const JingleSessionContent *jsc,
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
761 FsCandidate *candidate)
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
762 {
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
763 JingleSession *session =
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
764 jabber_jingle_session_content_get_session(jsc);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
765 JabberIq *request = jabber_jingle_session_create_iq(session);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
766 xmlnode *jingle =
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
767 jabber_jingle_session_add_jingle(session, request,
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
768 "transport-info");
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
769 xmlnode *content = jabber_jingle_session_add_content(jsc, jingle);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
770 xmlnode *transport = jabber_jingle_session_add_transport(jsc, content);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
771 jabber_jingle_session_add_candidate_iceudp(transport, candidate, NULL);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
772 return request;
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
773 }
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
774 #if 0
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
775 static void
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
776 jabber_jingle_session_send_content_accept(JingleSession *session)
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
777 {
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
778 JabberIq *result = jabber_iq_new(jabber_jingle_session_get_js(session),
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
779 JABBER_IQ_SET);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
780 xmlnode *jingle = jabber_jingle_session_create_content_accept(session);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
781 xmlnode_set_attrib(result->node, "to",
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
782 jabber_jingle_session_get_remote_jid(session));
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
783
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
784 xmlnode_insert_child(result->node, jingle);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
785 jabber_iq_send(result);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
786 }
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
787 #endif
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
788 static void
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
789 jabber_jingle_session_send_session_accept(JingleSession *session)
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
790 {
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
791 /* create transport-info packages */
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
792 PurpleMedia *media = jabber_jingle_session_get_media(session);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
793 GList *contents = jabber_jingle_session_get_contents(session);
25680
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
794 const gchar *remote_jid = jabber_jingle_session_get_remote_jid(session);
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
795 for (; contents; contents = contents->next) {
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
796 JingleSessionContent *jsc = contents->data;
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
797 GList *candidates = purple_media_get_local_candidates(
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
798 media,
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
799 jabber_jingle_session_content_get_name(jsc),
25680
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
800 remote_jid);
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
801 purple_debug_info("jingle",
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
802 "jabber_session_candidates_prepared: %d candidates\n",
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
803 g_list_length(candidates));
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
804 for (; candidates; candidates = candidates->next) {
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
805 FsCandidate *candidate = candidates->data;
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
806 JabberIq *result = jabber_jingle_session_create_transport_info(jsc,
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
807 candidate);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
808 jabber_iq_send(result);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
809 }
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
810 fs_candidate_list_destroy(candidates);
25680
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
811
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
812 purple_debug_info("jingle", "codec intersection: %i\n",
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
813 g_list_length(purple_media_get_negotiated_codecs(media,
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
814 jabber_jingle_session_content_get_name(jsc))));
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
815 }
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
816
25680
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
817 if (purple_media_candidates_prepared(media, remote_jid)) {
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
818 jabber_iq_send(jabber_jingle_session_create_session_accept(session));
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
819
25680
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
820 purple_debug_info("jingle", "Sent session accept, starting stream\n");
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
821 gst_element_set_state(purple_media_get_pipeline(session->media), GST_STATE_PLAYING);
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
822 jabber_jingle_session_set_state(session, ACTIVE);
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
823 } else
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
824 jabber_jingle_session_set_state(session, ACCEPTED);
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
825 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
826
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
827 static void
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
828 jabber_jingle_session_send_session_reject(JingleSession *session)
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
829 {
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
830 jabber_iq_send(jabber_jingle_session_create_session_terminate(session,
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
831 "decline", NULL));
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
832 jabber_jingle_session_destroy(session);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
833 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
834
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
835 static void
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
836 jabber_jingle_session_send_session_terminate(JingleSession *session)
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
837 {
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
838 jabber_iq_send(jabber_jingle_session_create_session_terminate(session,
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
839 "no-error", NULL));
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
840 jabber_jingle_session_destroy(session);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
841 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
842
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
843 static void
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
844 jabber_jingle_session_content_create_media(JingleSession *session,
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
845 PurpleMediaStreamType type)
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
846 {
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
847 gchar sender[10] = "";
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
848
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
849 if (type & PURPLE_MEDIA_AUDIO) {
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
850 if (type == PURPLE_MEDIA_SEND_AUDIO)
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
851 strcpy(sender, "initiator");
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
852 else if (type == PURPLE_MEDIA_RECV_AUDIO)
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
853 strcpy(sender, "responder");
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
854 else
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
855 strcpy(sender, "both");
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
856 jabber_jingle_session_content_create_internal(session,
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
857 "audio-content", "initiator", sender,
25675
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
858 TRANSPORT_ICEUDP, JINGLE_RTP, "audio");
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
859 }
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
860 if (type & PURPLE_MEDIA_VIDEO) {
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
861 if (type == PURPLE_MEDIA_SEND_VIDEO)
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
862 strcpy(sender, "initiator");
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
863 else if (type == PURPLE_MEDIA_RECV_VIDEO)
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
864 strcpy(sender, "responder");
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
865 else
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
866 strcpy(sender, "both");
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
867 jabber_jingle_session_content_create_internal(session,
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
868 "video-content", "initiator", sender,
25675
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
869 TRANSPORT_ICEUDP, JINGLE_RTP, "video");
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
870 }
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
871 }
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
872
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
873 static void
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
874 jabber_jingle_session_content_create_parse(JingleSession *session,
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
875 xmlnode *content)
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
876 {
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
877 xmlnode *description = xmlnode_get_child(content, "description");
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
878 xmlnode *transport = xmlnode_get_child(content, "transport");
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
879
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
880 const gchar *creator = xmlnode_get_attrib(content, "creator");
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
881 const gchar *sender = xmlnode_get_attrib(content, "sender");
25675
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
882 const gchar *subtype = xmlnode_get_attrib(description, "media");
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
883
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
884 jabber_jingle_session_content_create_internal(session,
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
885 xmlnode_get_attrib(content, "name"),
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
886 creator ? creator : "initiator",
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
887 sender ? sender : "both",
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
888 xmlnode_get_namespace(transport),
25675
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
889 xmlnode_get_namespace(description),
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
890 subtype);
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
891 }
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
892
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
893 static void
25680
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
894 jabber_jingle_session_new_candidate_cb(PurpleMedia *media,
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
895 const gchar *session_id,
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
896 const gchar *name,
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
897 FsCandidate *candidate,
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
898 JingleSession *session)
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
899 {
25680
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
900 if (jabber_jingle_session_get_state(session) == GOT_ACK ||
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
901 jabber_jingle_session_get_state(session) == ACTIVE) {
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
902 JingleSessionContent *jsc = jabber_jingle_session_get_content(session,
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
903 session_id);
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
904 jabber_iq_send(jabber_jingle_session_create_transport_info(jsc,
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
905 candidate));
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
906 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
907 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
908
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
909 /* callback called when a pair of transport candidates (local and remote)
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
910 has been established */
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
911 static void
25680
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
912 jabber_jingle_session_candidate_pair_established_cb(PurpleMedia *media,
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
913 FsCandidate *native_candidate,
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
914 FsCandidate *remote_candidate,
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
915 JingleSession *session)
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
916 {
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
917 if (!jabber_jingle_session_is_initiator(session) &&
25680
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
918 jabber_jingle_session_get_state(session) == ACCEPTED &&
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
919 purple_media_candidates_prepared(media,
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
920 jabber_jingle_session_get_remote_jid(session))) {
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
921 jabber_iq_send(jabber_jingle_session_create_session_accept(session));
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
922
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
923 purple_debug_info("jingle", "Sent session accept, starting stream\n");
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
924 gst_element_set_state(purple_media_get_pipeline(session->media),
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
925 GST_STATE_PLAYING);
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
926 jabber_jingle_session_set_state(session, ACTIVE);
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
927 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
928 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
929
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
930 static gboolean
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
931 jabber_jingle_session_initiate_media_internal(JingleSession *session,
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
932 const char *initiator,
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
933 const char *remote_jid)
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
934 {
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
935 PurpleMedia *media = NULL;
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
936 GList *contents = jabber_jingle_session_get_contents(session);
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
937
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
938 media = purple_media_manager_create_media(purple_media_manager_get(),
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
939 session->js->gc, "fsrtpconference", remote_jid);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
940
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
941 if (!media) {
25672
a7be3074923b Corrected debug labels s/"jabber"/"jingle"/
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
942 purple_debug_error("jingle", "Couldn't create fsrtpconference\n");
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
943 return FALSE;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
944 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
945
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
946 for (; contents; contents = contents->next) {
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
947 JingleSessionContent *jsc = contents->data;
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
948 gboolean result = FALSE;
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
949
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
950 /* these will need to be changed to "nice" once the libnice transmitter is finished */
25675
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
951 if (jabber_jingle_session_content_is_vv_type(jsc, "audio")) {
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
952 result = purple_media_add_stream(media, "audio-content", remote_jid,
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
953 PURPLE_MEDIA_AUDIO, "rawudp");
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
954 purple_debug_info("jingle", "Created Jingle audio session\n");
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
955 }
25675
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
956 else if (jabber_jingle_session_content_is_vv_type(jsc, "video")) {
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
957 result = purple_media_add_stream(media, "video-content", remote_jid,
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
958 PURPLE_MEDIA_VIDEO, "rawudp");
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
959 purple_debug_info("jingle", "Created Jingle video session\n");
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
960 }
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
961
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
962 if (!result) {
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
963 purple_debug_error("jingle", "Couldn't create stream\n");
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
964 purple_media_reject(media);
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
965 return FALSE;
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
966 }
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
967 }
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
968 g_list_free(contents);
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
969
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
970 jabber_jingle_session_set_remote_jid(session, remote_jid);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
971 jabber_jingle_session_set_initiator(session, initiator);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
972 jabber_jingle_session_set_media(session, media);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
973
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
974 /* connect callbacks */
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
975 g_signal_connect_swapped(G_OBJECT(media), "accepted",
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
976 G_CALLBACK(jabber_jingle_session_send_session_accept), session);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
977 g_signal_connect_swapped(G_OBJECT(media), "reject",
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
978 G_CALLBACK(jabber_jingle_session_send_session_reject), session);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
979 g_signal_connect_swapped(G_OBJECT(media), "hangup",
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
980 G_CALLBACK(jabber_jingle_session_send_session_terminate), session);
25680
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
981 g_signal_connect(G_OBJECT(media), "new-candidate",
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
982 G_CALLBACK(jabber_jingle_session_new_candidate_cb), session);
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
983 g_signal_connect(G_OBJECT(media), "candidate-pair",
25680
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
984 G_CALLBACK(jabber_jingle_session_candidate_pair_established_cb), session);
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
985
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
986 purple_media_ready(media);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
987
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
988 return TRUE;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
989 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
990
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
991 static void
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
992 jabber_jingle_session_initiate_result_cb(JabberStream *js, xmlnode *packet, gpointer data)
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
993 {
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
994 const char *from = xmlnode_get_attrib(packet, "from");
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
995 JingleSession *session = jabber_jingle_session_find_by_jid(js, from);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
996 PurpleMedia *media = session->media;
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
997 GList *contents;
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
998
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
999 if (!strcmp(xmlnode_get_attrib(packet, "type"), "error")) {
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1000 purple_media_got_hangup(media);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1001 return;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1002 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1003
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1004 /* catch errors */
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1005 if (xmlnode_get_child(packet, "error")) {
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1006 purple_media_got_hangup(media);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1007 return;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1008 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1009
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1010 /* create transport-info packages */
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1011 contents = jabber_jingle_session_get_contents(session);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1012 for (; contents; contents = contents->next) {
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1013 JingleSessionContent *jsc = contents->data;
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1014 GList *candidates = purple_media_get_local_candidates(
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1015 jabber_jingle_session_get_media(session),
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1016 jabber_jingle_session_content_get_name(jsc),
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1017 jabber_jingle_session_get_remote_jid(session));
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
1018 purple_debug_info("jingle",
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1019 "jabber_session_candidates_prepared: %d candidates\n",
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1020 g_list_length(candidates));
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1021 for (; candidates; candidates = candidates->next) {
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1022 FsCandidate *candidate = candidates->data;
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1023 JabberIq *result = jabber_jingle_session_create_transport_info(jsc,
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1024 candidate);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1025 jabber_iq_send(result);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1026 }
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1027 fs_candidate_list_destroy(candidates);
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1028 }
25680
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
1029
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
1030 jabber_jingle_session_set_state(session, GOT_ACK);
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1031 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1032
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1033 PurpleMedia *
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1034 jabber_jingle_session_initiate_media(JabberStream *js, const char *who,
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1035 PurpleMediaStreamType type)
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1036 {
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1037 /* create content negotiation */
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1038 JabberIq *request;
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1039 JingleSession *session;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1040 JabberBuddy *jb;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1041 JabberBuddyResource *jbr;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1042
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1043 char *jid = NULL, *me = NULL;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1044
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1045 /* construct JID to send to */
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1046 jb = jabber_buddy_find(js, who, FALSE);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1047 if (!jb) {
25672
a7be3074923b Corrected debug labels s/"jabber"/"jingle"/
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1048 purple_debug_error("jingle", "Could not find Jabber buddy\n");
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1049 return NULL;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1050 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1051 jbr = jabber_buddy_find_resource(jb, NULL);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1052 if (!jbr) {
25672
a7be3074923b Corrected debug labels s/"jabber"/"jingle"/
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1053 purple_debug_error("jingle", "Could not find buddy's resource\n");
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1054 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1055
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1056 if ((strchr(who, '/') == NULL) && jbr && (jbr->name != NULL)) {
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1057 jid = g_strdup_printf("%s/%s", who, jbr->name);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1058 } else {
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1059 jid = g_strdup(who);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1060 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1061
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1062 session = jabber_jingle_session_create(js);
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1063 jabber_jingle_session_content_create_media(session, type);
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1064
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1065 /* set ourselves as initiator */
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1066 me = g_strdup_printf("%s@%s/%s", js->user->node, js->user->domain, js->user->resource);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1067
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1068 if (!jabber_jingle_session_initiate_media_internal(session, me, jid)) {
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1069 g_free(jid);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1070 g_free(me);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1071 jabber_jingle_session_destroy(session);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1072 return NULL;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1073 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1074
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1075 g_free(jid);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1076 g_free(me);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1077
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1078 /* create request */
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1079 request = jabber_jingle_session_create_session_initiate(session);
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1080 jabber_iq_set_callback(request, jabber_jingle_session_initiate_result_cb, NULL);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1081
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1082 /* send request to other part */
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1083 jabber_iq_send(request);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1084
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1085 return session->media;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1086 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1087
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1088 void
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1089 jabber_jingle_session_terminate_session_media(JabberStream *js, const gchar *who)
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1090 {
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1091 JingleSession *session;
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1092
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1093 session = jabber_jingle_session_find_by_jid(js, who);
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1094
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1095 if (session)
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1096 purple_media_hangup(session->media);
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1097 }
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1098
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1099 void
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1100 jabber_jingle_session_terminate_sessions(JabberStream *js)
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1101 {
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1102 GList *values = g_hash_table_get_values(js->sessions);
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1103
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1104 for (; values; values = values->next) {
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1105 JingleSession *session = (JingleSession *)values->data;
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1106 purple_media_hangup(session->media);
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1107 }
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1108
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1109 g_list_free(values);
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1110 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1111
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1112 void
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1113 jabber_jingle_session_handle_content_replace(JabberStream *js, xmlnode *packet)
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1114 {
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1115 #if 0
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1116 xmlnode *jingle = xmlnode_get_child(packet, "jingle");
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1117 const char *sid = xmlnode_get_attrib(jingle, "sid");
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1118 JingleSession *session = jabber_jingle_session_find_by_id(js, sid);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1119
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1120 if (!jabber_jingle_session_is_initiator(session) && session->session_started) {
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1121 JabberIq *result = jabber_iq_new(js, JABBER_IQ_RESULT);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1122 JabberIq *accept = jabber_iq_new(js, JABBER_IQ_SET);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1123 xmlnode *content_accept = NULL;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1124
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1125 /* send acknowledement */
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1126 xmlnode_set_attrib(result->node, "id", xmlnode_get_attrib(packet, "id"));
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1127 xmlnode_set_attrib(result->node, "to", xmlnode_get_attrib(packet, "from"));
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1128 jabber_iq_send(result);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1129
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1130 /* send content-accept */
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1131 content_accept = jabber_jingle_session_create_content_accept(session);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1132 xmlnode_set_attrib(accept->node, "id", xmlnode_get_attrib(packet, "id"));
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1133 xmlnode_set_attrib(accept->node, "to", xmlnode_get_attrib(packet, "from"));
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1134 xmlnode_insert_child(accept->node, content_accept);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1135
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1136 jabber_iq_send(accept);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1137 }
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1138 #endif
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1139 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1140
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1141 void
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1142 jabber_jingle_session_handle_session_accept(JabberStream *js, xmlnode *packet)
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1143 {
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1144 JabberIq *result = jabber_iq_new(js, JABBER_IQ_RESULT);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1145 xmlnode *jingle = xmlnode_get_child(packet, "jingle");
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1146 xmlnode *content = xmlnode_get_child(jingle, "content");
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1147 const char *sid = xmlnode_get_attrib(jingle, "sid");
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1148 const char *action = xmlnode_get_attrib(jingle, "action");
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1149 JingleSession *session = jabber_jingle_session_find_by_id(js, sid);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1150 GList *remote_codecs = NULL;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1151 GList *remote_transports = NULL;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1152 GList *codec_intersection;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1153 FsCodec *top = NULL;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1154 xmlnode *description = NULL;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1155 xmlnode *transport = NULL;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1156
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1157 /* We should probably check validity of the incoming XML... */
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1158
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1159 xmlnode_set_attrib(result->node, "to",
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1160 jabber_jingle_session_get_remote_jid(session));
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1161 jabber_iq_set_id(result, xmlnode_get_attrib(packet, "id"));
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1162
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1163 for (content = xmlnode_get_child(jingle, "content"); content;
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1164 content = xmlnode_get_next_twin(content)) {
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1165 description = xmlnode_get_child(content, "description");
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1166 transport = xmlnode_get_child(content, "transport");
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1167
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1168 /* fetch codecs from remote party */
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
1169 purple_debug_info("jingle", "get codecs from session-accept\n");
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1170 remote_codecs = jabber_jingle_get_codecs(description);
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
1171 purple_debug_info("jingle", "get transport candidates from session accept\n");
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1172 remote_transports = jabber_jingle_get_candidates(transport);
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1173
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
1174 purple_debug_info("jingle", "Got %d codecs from responder\n",
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1175 g_list_length(remote_codecs));
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
1176 purple_debug_info("jingle", "Got %d transport candidates from responder\n",
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1177 g_list_length(remote_transports));
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1178
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
1179 purple_debug_info("jingle", "Setting remote codecs on stream\n");
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1180
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1181 purple_media_set_remote_codecs(session->media,
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1182 xmlnode_get_attrib(content, "name"),
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1183 jabber_jingle_session_get_remote_jid(session),
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1184 remote_codecs);
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1185
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1186 codec_intersection = purple_media_get_negotiated_codecs(session->media,
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1187 xmlnode_get_attrib(content, "name"));
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
1188 purple_debug_info("jingle", "codec_intersection contains %d elems\n",
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1189 g_list_length(codec_intersection));
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1190 /* get the top codec */
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1191 if (g_list_length(codec_intersection) > 0) {
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1192 top = (FsCodec *) codec_intersection->data;
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
1193 purple_debug_info("jingle", "Found a suitable codec on stream = %d\n",
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1194 top->id);
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1195
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1196 /* we have found a suitable codec, but we will not start the stream
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1197 just yet, wait for transport negotiation to complete... */
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1198 }
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1199 /* if we also got transport candidates, add them to our streams
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1200 list of known remote candidates */
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1201 if (g_list_length(remote_transports) > 0) {
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1202 purple_media_add_remote_candidates(session->media,
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1203 xmlnode_get_attrib(content, "name"),
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1204 jabber_jingle_session_get_remote_jid(session),
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1205 remote_transports);
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1206 fs_candidate_list_destroy(remote_transports);
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1207 }
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1208 if (g_list_length(codec_intersection) == 0 &&
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1209 g_list_length(remote_transports)) {
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1210 /* we didn't get any candidates and the codec intersection is empty,
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1211 this means this was not a content-accept message and we couldn't
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1212 find any suitable codecs, should return error and hang up */
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1213
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1214 }
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1215
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1216 fs_codec_list_destroy(codec_intersection);
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1217
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1218 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1219
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1220 if (!strcmp(action, "session-accept")) {
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1221 purple_media_got_accept(jabber_jingle_session_get_media(session));
25672
a7be3074923b Corrected debug labels s/"jabber"/"jingle"/
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1222 purple_debug_info("jingle", "Got session-accept, starting stream\n");
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1223 gst_element_set_state(purple_media_get_pipeline(session->media),
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1224 GST_STATE_PLAYING);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1225 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1226
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1227 jabber_iq_send(result);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1228
25680
b5a00ddb7077 Jingle sessions now keep track of their transaction state to a degree.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25675
diff changeset
1229 jabber_jingle_session_set_state(session, ACTIVE);
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1230 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1231
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1232 void
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1233 jabber_jingle_session_handle_session_info(JabberStream *js, xmlnode *packet)
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1234 {
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1235 purple_debug_info("jingle", "got session-info\n");
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1236 jabber_iq_send(jabber_jingle_session_create_ack(js, packet));
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1237 }
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1238
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1239 void
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1240 jabber_jingle_session_handle_session_initiate(JabberStream *js, xmlnode *packet)
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1241 {
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1242 JingleSession *session = NULL;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1243 xmlnode *jingle = xmlnode_get_child(packet, "jingle");
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1244 xmlnode *content = NULL;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1245 xmlnode *description = NULL;
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
1246 xmlnode *transport = NULL;
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1247 const char *sid = NULL;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1248 const char *initiator = NULL;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1249 GList *codecs = NULL;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1250
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1251 if (!jingle) {
25672
a7be3074923b Corrected debug labels s/"jabber"/"jingle"/
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1252 purple_debug_error("jingle", "Malformed request");
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1253 return;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1254 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1255
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1256 sid = xmlnode_get_attrib(jingle, "sid");
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1257 initiator = xmlnode_get_attrib(jingle, "initiator");
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1258
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1259 if (jabber_jingle_session_find_by_id(js, sid)) {
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1260 /* This should only happen if you start a session with yourself */
25672
a7be3074923b Corrected debug labels s/"jabber"/"jingle"/
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1261 purple_debug_error("jingle", "Jingle session with id={%s} already exists\n", sid);
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1262 return;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1263 }
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1264
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1265 session = jabber_jingle_session_create_by_id(js, sid);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1266
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1267 for (content = xmlnode_get_child(jingle, "content"); content;
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1268 content = xmlnode_get_next_twin(content)) {
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1269 /* init media */
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1270 if (!content) {
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
1271 purple_debug_error("jingle", "jingle tag must contain content tag\n");
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1272 /* should send error here */
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1273 return;
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1274 }
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1275
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1276 description = xmlnode_get_child(content, "description");
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1277
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1278 if (!description) {
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
1279 purple_debug_error("jingle", "content tag must contain description tag\n");
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1280 /* we should create an error iq here */
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1281 return;
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1282 }
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1283
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1284 transport = xmlnode_get_child(content, "transport");
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1285
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1286 if (!transport) {
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1287 purple_debug_error("jingle", "content tag must contain transport tag\n");
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1288 /* we should create an error iq here */
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1289 return;
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1290 }
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
1291
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1292 jabber_jingle_session_content_create_parse(session, content);
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1293 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1294
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1295 if (!jabber_jingle_session_initiate_media_internal(session, initiator, initiator)) {
25672
a7be3074923b Corrected debug labels s/"jabber"/"jingle"/
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1296 purple_debug_error("jingle", "Couldn't start media session with %s\n", initiator);
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1297 jabber_jingle_session_destroy(session);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1298 /* we should create an error iq here */
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1299 return;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1300 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1301
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1302 for (content = xmlnode_get_child(jingle, "content"); content;
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1303 content = xmlnode_get_next_twin(content)) {
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1304 /* init media */
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1305 if (!content) {
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
1306 purple_debug_error("jingle", "jingle tag must contain content tag\n");
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1307 /* should send error here */
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1308 return;
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1309 }
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1310
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1311 description = xmlnode_get_child(content, "description");
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1312
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1313 if (!description) {
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
1314 purple_debug_error("jingle", "content tag must contain description tag\n");
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1315 /* we should create an error iq here */
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1316 return;
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1317 }
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1318 codecs = jabber_jingle_get_codecs(description);
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1319
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1320 purple_media_set_remote_codecs(session->media,
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1321 xmlnode_get_attrib(content, "name"),
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1322 initiator, codecs);
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1323 purple_debug_info("jingle", "codec intersection: %i\n",
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1324 g_list_length(purple_media_get_negotiated_codecs(session->media,
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1325 xmlnode_get_attrib(content, "name"))));
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1326 }
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1327 jabber_iq_send(jabber_jingle_session_create_ack(js, packet));
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1328 jabber_iq_send(jabber_jingle_session_create_session_info(session, "ringing"));
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1329 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1330
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1331 void
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1332 jabber_jingle_session_handle_session_terminate(JabberStream *js, xmlnode *packet)
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1333 {
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1334 xmlnode *jingle = xmlnode_get_child(packet, "jingle");
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1335 const char *sid = xmlnode_get_attrib(jingle, "sid");
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1336 JingleSession *session = jabber_jingle_session_find_by_id(js, sid);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1337
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1338 if (!session) {
25672
a7be3074923b Corrected debug labels s/"jabber"/"jingle"/
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1339 purple_debug_error("jingle", "jabber_handle_session_terminate couldn't find session\n");
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1340 return;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1341 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1342
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1343 /* maybe we should look at the reasoncode to determine if it was
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1344 a hangup or a reject, and call different callbacks to purple_media */
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1345 gst_element_set_state(purple_media_get_pipeline(session->media), GST_STATE_NULL);
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1346
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1347 purple_media_got_hangup(jabber_jingle_session_get_media(session));
25670
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1348 jabber_iq_send(jabber_jingle_session_create_ack(js, packet));
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1349 jabber_jingle_session_destroy(session);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1350 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1351
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1352 void
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1353 jabber_jingle_session_handle_transport_info(JabberStream *js, xmlnode *packet)
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1354 {
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1355 JabberIq *result = jabber_iq_new(js, JABBER_IQ_RESULT);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1356 xmlnode *jingle = xmlnode_get_child(packet, "jingle");
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1357 xmlnode *content = xmlnode_get_child(jingle, "content");
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1358 xmlnode *transport = xmlnode_get_child(content, "transport");
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1359 GList *remote_candidates = jabber_jingle_get_candidates(transport);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1360 const char *sid = xmlnode_get_attrib(jingle, "sid");
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1361 JingleSession *session = jabber_jingle_session_find_by_id(js, sid);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1362
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1363 if (!session)
25672
a7be3074923b Corrected debug labels s/"jabber"/"jingle"/
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1364 purple_debug_error("jingle", "jabber_handle_session_candidates couldn't find session\n");
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1365
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1366 /* send acknowledement */
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1367 xmlnode_set_attrib(result->node, "id", xmlnode_get_attrib(packet, "id"));
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1368 xmlnode_set_attrib(result->node, "to", xmlnode_get_attrib(packet, "from"));
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1369 jabber_iq_send(result);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1370
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1371 /* add candidates to our list of remote candidates */
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1372 if (g_list_length(remote_candidates) > 0) {
25671
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1373 purple_media_add_remote_candidates(session->media,
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1374 xmlnode_get_attrib(content, "name"),
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1375 xmlnode_get_attrib(packet, "from"),
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25670
diff changeset
1376 remote_candidates);
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1377 fs_candidate_list_destroy(remote_candidates);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1378 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1379 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1380
25654
cbe97caec684 Use USE_VV instead of USE_FARSIGHT.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25648
diff changeset
1381 #endif /* USE_VV */
25674
bfaad8393463 Added some utility functions to convert PurpleMediaStreamType
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25673
diff changeset
1382