annotate libpurple/protocols/jabber/jingle.c @ 25675:c984acc6c392

Added the "media" attribute to the Jingle description element according to changes to XEP-0167.
author Mike Ruprecht <maiku@soc.pidgin.im>
date Fri, 06 Jun 2008 20:28:20 +0000
parents bfaad8393463
children b5a00ddb7077
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
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
39 typedef struct {
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
40 char *id;
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
41 JabberStream *js;
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
42 PurpleMedia *media;
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
43 char *remote_jid;
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
44 char *initiator;
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
45 gboolean is_initiator;
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
46 gboolean session_started;
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
47 GHashTable *contents; /* JingleSessionContent table */
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
48 } JingleSession;
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
49
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
50 typedef struct {
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
51 gchar *name;
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
52 JingleSession *session;
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
53 gchar *creator;
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
54 gchar *sender;
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
55 gchar *transport_type;
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
56 gchar *type;
25675
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
57 gchar *subtype;
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
58 } JingleSessionContent;
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
59
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
60 static void
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
61 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
62 const gchar *name,
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
63 const gchar *creator,
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
64 const gchar *sender,
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
65 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
66 const gchar *type,
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
67 const gchar *subtype)
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
68 {
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
69 JingleSessionContent *content = g_new0(JingleSessionContent, 1);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
70 content->session = session;
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
71 content->name = g_strdup(name);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
72 content->creator = g_strdup(creator);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
73 content->sender = g_strdup(sender);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
74 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
75 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
76 content->subtype = g_strdup(subtype);
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
77
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
78 if (!session->contents) {
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
79 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
80 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
81 }
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
82 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
83 content->name);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
84 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
85 }
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
86
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
87 static void
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
88 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
89 {
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
90 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
91 content->name);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
92 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
93 g_free(content->name);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
94 g_free(content->creator);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
95 g_free(content->sender);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
96 g_free(content->transport_type);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
97 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
98 g_free(content->subtype);
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
99 g_free(content);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
100 }
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
101
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
102 static const gchar *
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
103 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
104 {
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
105 return jsc->name;
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
106 }
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 static JingleSession *
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
109 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
110 {
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
111 return jsc->session;
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
112 }
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 static const gchar *
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
115 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
116 {
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
117 return jsc->creator;
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
118 }
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 static const gchar *
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
121 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
122 {
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
123 return jsc->sender;
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
124 }
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 static const gchar *
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
127 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
128 {
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
129 return jsc->transport_type;
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
130 }
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
131
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
132 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
133 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
134 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
135 {
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
136 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
137 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
138 }
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
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
140 static const gchar *
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
141 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
142 {
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
143 return jsc->type;
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
144 }
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
145
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
146 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
147 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
148 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
149 {
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
150 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
151 }
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
152
25675
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
153 static gchar *
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
154 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
155 {
25675
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
156 return jsc->subtype;
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
157 }
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
158
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
159 static gboolean
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
160 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
161 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
162 {
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
163 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
164 !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
165 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
166 }
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
167
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
168 static void
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
169 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
170 const char *sender)
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
171 {
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
172 if (jsc->sender)
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
173 g_free(jsc->sender);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
174 jsc->sender = g_strdup(sender);
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
175 }
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
176
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
177 static gboolean
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
178 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
179 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
180 purple_debug_info("jingle",
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
181 "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
182 ((JingleSession *)a)->id,
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
183 ((JingleSession *)b)->id);
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
184 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
185 }
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 static JingleSession *
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
188 jabber_jingle_session_create_internal(JabberStream *js,
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
189 const char *id)
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
190 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
191 JingleSession *sess = g_new0(JingleSession, 1);
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
192 sess->js = js;
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 if (id) {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
195 sess->id = g_strdup(id);
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
196 } else if (js) {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
197 /* init the session ID... */
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
198 sess->id = jabber_get_next_id(js);
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
199 }
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 /* 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
202 if (!js->sessions) {
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
203 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
204 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
205 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
206 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
207 sess->id);
25648
16543025aed1 Moved jingle.c global variable "sessions" into JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25647
diff changeset
208 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
209
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
210 sess->session_started = FALSE;
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
211
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
212 return sess;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
213 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
214
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
215 static JabberStream *
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
216 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
217 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
218 return sess->js;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
219 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
220
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
221 static JingleSession *
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
222 jabber_jingle_session_create(JabberStream *js)
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
223 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
224 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
225 sess->is_initiator = TRUE;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
226 return sess;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
227 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
228
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
229 static JingleSession *
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
230 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
231 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
232 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
233 sess->is_initiator = FALSE;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
234 return sess;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
235 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
236
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
237 static const char *
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
238 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
239 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
240 return sess->id;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
241 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
242
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
243 static void
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
244 jabber_jingle_session_destroy(JingleSession *sess)
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
245 {
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
246 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
247 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
248 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
249 g_object_unref(sess->media);
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
250
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
251 for (; contents; contents = contents->next)
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
252 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
253
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
254 g_list_free(contents);
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
255 g_free(sess);
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
256 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
257
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
258 static JingleSession *
25648
16543025aed1 Moved jingle.c global variable "sessions" into JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25647
diff changeset
259 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
260 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
261 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
262 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
263 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
264 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
265 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
266 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
267 }
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
268
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
269 static JingleSession *
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
270 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
271 {
25648
16543025aed1 Moved jingle.c global variable "sessions" into JabberStream.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25647
diff changeset
272 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
273 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
274 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
275
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
276 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
277 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
278 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
279 : 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
280 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
281 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
282 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
283 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
284 }
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 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
286 }
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
287
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
288 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
289 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
290 }
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
291
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
292 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
293 jabber_jingle_get_codecs(xmlnode *description)
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
294 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
295 GList *codecs = NULL;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
296 xmlnode *codec_element = NULL;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
297 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
298 FsCodec *codec;
25675
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
299 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
300 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
301 !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
302 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
303
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
304 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
305 codec_element ;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
306 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
307 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
308
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
309 id = xmlnode_get_attrib(codec_element, "id");
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
310 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
311
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
312 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
313 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
314 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
315 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
316 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
317 "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
318 "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
319 codecs = g_list_append(codecs, codec);
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
320 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
321 return codecs;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
322 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
323
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
324 static GList *
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
325 jabber_jingle_get_candidates(const xmlnode *transport)
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
326 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
327 GList *candidates = NULL;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
328 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
329 FsCandidate *c;
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
330
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
331 for (candidate = xmlnode_get_child(transport, "candidate") ;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
332 candidate ;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
333 candidate = xmlnode_get_next_twin(candidate)) {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
334 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
335 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
336 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
337 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
338 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
339 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
340 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
341 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
342 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
343 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
344 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
345 strcmp(xmlnode_get_attrib(candidate, "protocol"),
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
346 "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
347 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
348 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
349 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
350 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
351 candidates = g_list_append(candidates, c);
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
352 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
353
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
354 return candidates;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
355 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
356
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
357 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
358 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
359 const char *name)
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
360 {
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
361 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
362 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
363 }
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
364
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 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
366 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
367 {
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 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
369 }
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
370
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
371 static PurpleMedia *
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
372 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
373 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
374 return sess->media;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
375 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
376
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
377 static void
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
378 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
379 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
380 sess->media = media;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
381 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
382
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
383 static const char *
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
384 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
385 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
386 return sess->remote_jid;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
387 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
388
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
389 static void
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
390 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
391 const char *remote_jid)
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 sess->remote_jid = strdup(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 const char *
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
397 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
398 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
399 return sess->initiator;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
400 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
401
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
402 static void
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
403 jabber_jingle_session_set_initiator(JingleSession *sess,
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
404 const char *initiator)
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
405 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
406 sess->initiator = g_strdup(initiator);
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
407 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
408
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
409 static gboolean
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
410 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
411 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
412 return sess->is_initiator;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
413 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
414
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
415 static void
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
416 jabber_jingle_session_add_payload_types(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
417 xmlnode *description)
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
418 {
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
419 JingleSession *session = 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
420 PurpleMedia *media = jabber_jingle_session_get_media(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
421 /* should this be local_codecs or negotiated-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
422 GList *codecs = purple_media_get_local_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
423 jabber_jingle_session_content_get_name(jsc));
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
424
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
425 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
426 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
427 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
428 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
429
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
430 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
431 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
432 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
433
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
434 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
435 xmlnode_set_attrib(payload, "id", id);
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
436 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
437 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
438 }
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
439 fs_codec_list_destroy(codecs);
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
440 }
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
441
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
442 static xmlnode *
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
443 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
444 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
445 {
25675
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
446 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
447 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
448 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
449 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
450 }
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
451
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
452 static xmlnode *
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
453 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
454 xmlnode *content)
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
455 {
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
456 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
457 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
458 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
459
25675
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
460 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
461 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
462 else
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
463 return description;
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
464 }
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
465
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
466 static xmlnode *
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
467 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
468 FsCandidate *c,
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
469 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
470 {
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
471 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
472 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
473 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
474 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
475
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
476 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
477 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
478 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
479
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
480 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
481 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
482 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
483 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
484 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
485 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
486 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
487 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
488 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
489 "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
490 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
491 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
492 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
493 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
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, "type",
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
496 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
497 "host" :
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
498 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
499 "prflx" :
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
500 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
501 "relay" :
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
502 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
503 "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
504
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
505 /* relay */
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
506 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
507 /* 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
508 }
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 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
511 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
512 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
513 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
514 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
515 }
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
516
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
517 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
518 }
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
519
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
520 static xmlnode *
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
521 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
522 xmlnode *content)
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
523 {
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
524 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
525 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
526 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
527 return transport;
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
528 }
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
529
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
530 static xmlnode *
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
531 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
532 xmlnode *jingle)
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
533 {
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
534 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
535 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
536 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
537 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
538 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
539 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
540 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
541 return content;
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
542 }
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_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
547 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
548 {
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
549 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
550 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
551 xmlnode_set_namespace(jingle, JINGLE);
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
552 xmlnode_set_attrib(jingle, "action", action);
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
553 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
554 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
555 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
556 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
557 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
558 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
559 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
560 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
561 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
562 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
563 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
564 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
565 }
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
566 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
567
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
568 return jingle;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
569 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
570
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
571 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
572 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
573 {
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 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
575 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
576 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
577 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
578 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
579 }
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
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
581 static JabberIq *
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
582 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
583 {
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
584 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
585 JABBER_IQ_SET);
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
586 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
587 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
588 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
589 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
590 g_free(from);
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
591 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
592 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
593 return result;
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
594 }
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
595 #if 0
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
596 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
597 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
598 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
599 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
600 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
601
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
602 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
603 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
604
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
605 xmlnode_set_attrib(content, "creator", "initiator");
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
606 xmlnode_set_attrib(content, "name", "audio-content");
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
607 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
608
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
609 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
610
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
611 return jingle;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
612 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
613
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
614 static xmlnode *
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
615 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
616 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
617 FsCandidate *remote_candidate)
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
618 {
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
619 xmlnode *jingle =
25669
d61b0c8aaca1 Added functions to help with the creation of Jingle packets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25668
diff changeset
620 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
621 xmlnode *content = NULL;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
622 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
623
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
624 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
625 ", 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
626 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
627
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
628 content = xmlnode_new_child(jingle, "content");
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
629 xmlnode_set_attrib(content, "creator", "initiator");
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
630 xmlnode_set_attrib(content, "name", "audio-content");
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
631 xmlnode_set_attrib(content, "profile", "RTP/AVP");
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
632
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
633 /* 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
634 /* 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
635
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25638
diff changeset
636 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
637
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 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
639 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
640 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
641 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
642
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
643 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
644
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
645 return jingle;
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
646 }
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
647 #endif
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
648
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
649 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
650 jabber_jingle_session_create_session_accept(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
651 FsCandidate *local,
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
652 FsCandidate *remote)
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
653 {
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 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
655 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
656 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
657 "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
658 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
659
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
660 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
661 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
662 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
663 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
664 xmlnode *transport = jabber_jingle_session_add_transport(jsc, content);
25675
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
665 if (jabber_jingle_session_content_is_type(jsc, JINGLE_RTP))
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
666 jabber_jingle_session_add_payload_types(jsc, 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
667 if (jabber_jingle_session_content_is_transport_type(jsc, TRANSPORT_ICEUDP))
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
668 jabber_jingle_session_add_candidate_iceudp(transport, local, remote);
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 }
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
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 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
672 }
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
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 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
675 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
676 const gchar *type)
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
677 {
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 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
679 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
680 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
681 "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
682 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
683 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
684 return request;
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
685 }
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
686
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
687 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
688 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
689 {
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
690 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
691 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
692 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
693 "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
694 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
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 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
697 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
698 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
699 xmlnode *description = jabber_jingle_session_add_description(jsc, content);
25675
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
700 if (jabber_jingle_session_content_is_type(jsc, JINGLE_RTP))
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
701 jabber_jingle_session_add_payload_types(jsc, 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
702 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
703 }
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
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 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
706 }
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
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
708 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
709 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
710 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
711 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
712 {
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 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
714 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
715 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
716 "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
717 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
718 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
719 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
720 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
721 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
722 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
723 }
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
724
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
725 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
726 }
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
727
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
728 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
729 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
730 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
731 {
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
732 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
733 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
734 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
735 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
736 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
737 "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
738 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
739 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
740 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
741 return request;
25638
9f36ed35615e Add the new jingle.c/h files.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
diff changeset
742 }
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
743 #if 0
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
744 static void
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
745 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
746 {
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
747 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
748 JABBER_IQ_SET);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
749 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
750 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
751 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
752
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
753 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
754 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
755 }
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
756 #endif
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
757 static void
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
758 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
759 {
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
760 /* 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
761 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
762 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
763 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
764 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
765 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
766 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
767 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
768 jabber_jingle_session_get_remote_jid(session));
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
769 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
770 "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
771 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
772 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
773 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
774 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
775 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
776 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
777 }
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
778 fs_candidate_list_destroy(candidates);
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
779 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
780 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
781 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
782 jabber_iq_send(jabber_jingle_session_create_session_accept(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
783 purple_media_get_local_candidate(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
784 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
785 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
786 purple_media_get_remote_candidate(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
787 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
788 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
789 }
25666
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
25672
a7be3074923b Corrected debug labels s/"jabber"/"jingle"/
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
792 purple_debug_info("jingle", "Sent 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
793 gst_element_set_state(purple_media_get_pipeline(session->media), GST_STATE_PLAYING);
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
794
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
795 session->session_started = TRUE;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
796 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
797
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
798 static void
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
799 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
800 {
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
801 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
802 "decline", NULL));
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
803 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
804 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
805
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
806 static void
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
807 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
808 {
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
809 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
810 "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
811 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
812 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
813
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
814 static void
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
815 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
816 PurpleMediaStreamType type)
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
817 {
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
818 gchar sender[10] = "";
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
819
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
820 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
821 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
822 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
823 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
824 strcpy(sender, "responder");
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
825 else
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
826 strcpy(sender, "both");
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
827 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
828 "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
829 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
830 }
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
831 if (type & PURPLE_MEDIA_VIDEO) {
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
832 if (type == PURPLE_MEDIA_SEND_VIDEO)
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
833 strcpy(sender, "initiator");
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
834 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
835 strcpy(sender, "responder");
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
836 else
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
837 strcpy(sender, "both");
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
838 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
839 "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
840 TRANSPORT_ICEUDP, JINGLE_RTP, "video");
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
841 }
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
842 }
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
843
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
844 static void
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
845 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
846 xmlnode *content)
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
847 {
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
848 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
849 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
850
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
851 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
852 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
853 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
854
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
855 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
856 xmlnode_get_attrib(content, "name"),
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
857 creator ? creator : "initiator",
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
858 sender ? sender : "both",
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
859 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
860 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
861 subtype);
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
862 }
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
863
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
864 /* callback called when new local transport candidate(s) are available on the
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
865 Farsight stream */
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
866 static void
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
867 jabber_jingle_session_candidates_prepared(PurpleMedia *media, JingleSession *session)
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
868 {
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
869 #if 0
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
870 if (!jabber_jingle_session_is_initiator(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
871 /* 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
872 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
873 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
874 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
875 GList *candidates = purple_media_get_local_audio_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
876 jabber_jingle_session_get_media(session));
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
877 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
878 "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
879 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
880 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
881 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
882 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
883 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
884 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
885 }
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
886 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
887 }
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
888 }
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
889 #endif
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
890 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
891
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
892 /* 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
893 has been established */
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
894 static void
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
895 jabber_jingle_session_candidate_pair_established(PurpleMedia *media,
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
896 FsCandidate *native_candidate,
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
897 FsCandidate *remote_candidate,
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
898 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
899 {
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
900 #if 0
25672
a7be3074923b Corrected debug labels s/"jabber"/"jingle"/
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
901 purple_debug_info("jingle", "jabber_candidate_pair_established called\n");
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
902 /* if we are the responder, we should send a sesson-accept message */
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
903 if (!jabber_jingle_session_is_initiator(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
904 !session->session_started) {
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
905 jabber_iq_send(jabber_jingle_session_create_session_accept(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
906 native_candidate, remote_candidate));
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
907 }
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
908 #endif
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
909 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
910
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
911 static gboolean
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
912 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
913 const char *initiator,
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
914 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
915 {
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
916 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
917 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
918
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
919 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
920 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
921
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
922 if (!media) {
25672
a7be3074923b Corrected debug labels s/"jabber"/"jingle"/
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
923 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
924 return FALSE;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
925 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
926
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
927 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
928 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
929 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
930
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
931 /* 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
932 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
933 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
934 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
935 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
936 }
25675
c984acc6c392 Added the "media" attribute to the Jingle description element according
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25674
diff changeset
937 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
938 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
939 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
940 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
941 }
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
942
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
943 if (!result) {
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
944 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
945 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
946 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
947 }
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
948 }
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
949 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
950
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
951 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
952 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
953 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
954
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
955 /* connect callbacks */
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
956 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
957 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
958 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
959 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
960 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
961 G_CALLBACK(jabber_jingle_session_send_session_terminate), session);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
962 g_signal_connect(G_OBJECT(media), "candidates-prepared",
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
963 G_CALLBACK(jabber_jingle_session_candidates_prepared), session);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
964 g_signal_connect(G_OBJECT(media), "candidate-pair",
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
965 G_CALLBACK(jabber_jingle_session_candidate_pair_established), session);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
966
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
967 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
968
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
969 return TRUE;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
970 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
971
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
972 static void
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
973 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
974 {
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
975 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
976 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
977 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
978 GList *contents;
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
979
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
980 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
981 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
982 return;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
983 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
984
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
985 /* catch errors */
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
986 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
987 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
988 return;
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
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
991 /* 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
992 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
993 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
994 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
995 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
996 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
997 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
998 jabber_jingle_session_get_remote_jid(session));
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
999 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
1000 "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
1001 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
1002 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
1003 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
1004 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
1005 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
1006 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
1007 }
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1008 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
1009 }
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1010 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1011
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1012 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
1013 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
1014 PurpleMediaStreamType type)
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1015 {
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1016 /* 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
1017 JabberIq *request;
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1018 JingleSession *session;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1019 JabberBuddy *jb;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1020 JabberBuddyResource *jbr;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1021
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1022 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
1023
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1024 /* 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
1025 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
1026 if (!jb) {
25672
a7be3074923b Corrected debug labels s/"jabber"/"jingle"/
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1027 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
1028 return NULL;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1029 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1030 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
1031 if (!jbr) {
25672
a7be3074923b Corrected debug labels s/"jabber"/"jingle"/
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1032 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
1033 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1034
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1035 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
1036 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
1037 } else {
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1038 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
1039 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1040
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1041 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
1042 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
1043
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1044 /* 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
1045 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
1046
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1047 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
1048 g_free(jid);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1049 g_free(me);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1050 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
1051 return NULL;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1052 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1053
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1054 g_free(jid);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1055 g_free(me);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1056
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1057 /* 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
1058 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
1059 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
1060
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1061 /* 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
1062 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
1063
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1064 return session->media;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1065 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1066
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1067 void
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1068 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
1069 {
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1070 JingleSession *session;
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1071
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1072 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
1073
25667
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1074 if (session)
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1075 purple_media_hangup(session->media);
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1076 }
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1077
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1078 void
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1079 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
1080 {
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1081 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
1082
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1083 for (; values; values = values->next) {
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1084 JingleSession *session = (JingleSession *)values->data;
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1085 purple_media_hangup(session->media);
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1086 }
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1087
41d6d4217d21 Further decoupled Jingle code from jabber.c:
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1088 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
1089 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1090
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1091 void
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1092 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
1093 {
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
1094 #if 0
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1095 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
1096 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
1097 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
1098
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1099 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
1100 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
1101 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
1102 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
1103
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1104 /* send acknowledement */
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1105 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
1106 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
1107 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
1108
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1109 /* send content-accept */
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1110 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
1111 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
1112 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
1113 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
1114
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1115 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
1116 }
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
1117 #endif
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1118 }
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 void
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1121 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
1122 {
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1123 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
1124 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
1125 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
1126 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
1127 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
1128 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
1129 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
1130 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
1131 GList *codec_intersection;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1132 FsCodec *top = NULL;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1133 xmlnode *description = NULL;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1134 xmlnode *transport = NULL;
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 /* 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
1137
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1138 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
1139 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
1140 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
1141
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
1142 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
1143 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
1144 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
1145 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
1146
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
1147 /* fetch codecs from remote party */
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
1148 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
1149 remote_codecs = jabber_jingle_get_codecs(description);
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
1150 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
1151 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
1152
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
1153 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
1154 g_list_length(remote_codecs));
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
1155 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
1156 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
1157
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
1158 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
1159
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
1160 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
1161 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
1162 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
1163 remote_codecs);
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1164
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
1165 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
1166 xmlnode_get_attrib(content, "name"));
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
1167 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
1168 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
1169 /* 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
1170 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
1171 top = (FsCodec *) codec_intersection->data;
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
1172 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
1173 top->id);
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1174
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 /* 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
1176 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
1177 }
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
1178 /* 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
1179 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
1180 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
1181 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
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_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
1185 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
1186 }
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 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
1188 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
1189 /* 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
1190 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
1191 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
1192
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
1193 }
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
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
1195 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
1196
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1197 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1198
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1199 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
1200 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
1201 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
1202 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
1203 GST_STATE_PLAYING);
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1204 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1205
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1206 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
1207
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1208 session->session_started = TRUE;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1209 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1210
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
1211 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
1212 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
1213 {
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1214 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
1215 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
1216 }
42e17cc5b6d2 Added functions to help create Jingle packets. Revised some of the Jingle flow.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25669
diff changeset
1217
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1218 void
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1219 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
1220 {
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1221 JingleSession *session = NULL;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1222 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
1223 xmlnode *content = NULL;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1224 xmlnode *description = NULL;
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
1225 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
1226 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
1227 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
1228 GList *codecs = NULL;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1229
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1230 if (!jingle) {
25672
a7be3074923b Corrected debug labels s/"jabber"/"jingle"/
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1231 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
1232 return;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1233 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1234
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1235 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
1236 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
1237
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1238 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
1239 /* 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
1240 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
1241 return;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1242 }
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
1243
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1244 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
1245
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
1246 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
1247 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
1248 /* 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
1249 if (!content) {
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
1250 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
1251 /* 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
1252 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
1253 }
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1254
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
1255 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
1256
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
1257 if (!description) {
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
1258 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
1259 /* 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
1260 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
1261 }
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
1262
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
1263 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
1264
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
1265 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
1266 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
1267 /* 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
1268 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
1269 }
25668
2ebe89114923 Added JingleSessionContent structure to store content information
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25667
diff changeset
1270
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
1271 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
1272 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1273
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1274 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
1275 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
1276 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
1277 /* 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
1278 return;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1279 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1280
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
1281 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
1282 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
1283 /* 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
1284 if (!content) {
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
1285 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
1286 /* 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
1287 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
1288 }
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1289
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
1290 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
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 if (!description) {
25673
9983353706b8 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25671 25672
diff changeset
1293 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
1294 /* 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
1295 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
1296 }
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
1297 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
1298
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
1299 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
1300 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
1301 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
1302 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
1303 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
1304 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
1305 }
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
1306 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
1307 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
1308 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1309
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1310 void
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1311 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
1312 {
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1313 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
1314 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
1315 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
1316
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1317 if (!session) {
25672
a7be3074923b Corrected debug labels s/"jabber"/"jingle"/
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1318 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
1319 return;
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1320 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1321
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1322 /* 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
1323 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
1324 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
1325
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1326 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
1327 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
1328 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
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_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
1333 {
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1334 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
1335 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
1336 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
1337 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
1338 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
1339 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
1340 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
1341
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1342 if (!session)
25672
a7be3074923b Corrected debug labels s/"jabber"/"jingle"/
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25666
diff changeset
1343 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
1344
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1345 /* send acknowledement */
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1346 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
1347 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
1348 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
1349
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1350 /* 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
1351 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
1352 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
1353 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
1354 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
1355 remote_candidates);
25666
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1356 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
1357 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1358 }
e73b03097664 Moved Jingle message handlers from jabber.c to jingle.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25661
diff changeset
1359
25654
cbe97caec684 Use USE_VV instead of USE_FARSIGHT.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25648
diff changeset
1360 #endif /* USE_VV */
25674
bfaad8393463 Added some utility functions to convert PurpleMediaStreamType
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25673
diff changeset
1361