libpurple/protocols/jabber/google.c

Tue, 03 Nov 2009 18:26:29 +0000

author
Marcus Lundblad <malu@pidgin.im>
date
Tue, 03 Nov 2009 18:26:29 +0000
branch
cpw.malu.xmpp.google_relay
changeset 28807
b97a0cc0c2f0
parent 28757
055c0bc2a3dd
parent 28715
405e99540ff1
child 28844
11123464441f
permissions
-rw-r--r--

propagate from branch 'im.pidgin.pidgin' (head a724c42684d3302f25f34e2b26034480f50aac6c)
to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head 405e99540ff174f37a2bb55520f5ee7ab49ca311)

15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1 /**
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15587
diff changeset
2 * Purple is the legal property of its developers, whose names are too numerous
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
3 * to list here. Please refer to the COPYRIGHT file distributed with this
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
4 * source distribution.
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
5 *
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
6 * This program is free software; you can redistribute it and/or modify
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
7 * it under the terms of the GNU General Public License as published by
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
8 * the Free Software Foundation; either version 2 of the License, or
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
9 * (at your option) any later version.
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
10 *
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
11 * This program is distributed in the hope that it will be useful,
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
14 * GNU General Public License for more details.
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
15 *
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
16 * You should have received a copy of the GNU General Public License
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
17 * along with this program; if not, write to the Free Software
19859
71d37b57eff2 The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 19046
diff changeset
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
19 */
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
20
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
21 #include "internal.h"
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
22 #include "debug.h"
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
23 #include "mediamanager.h"
15587
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
24 #include "util.h"
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
25 #include "privacy.h"
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
26 #include "dnsquery.h"
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
27 #include "network.h"
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
28
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
29 #include "buddy.h"
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
30 #include "google.h"
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
31 #include "jabber.h"
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
32 #include "presence.h"
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
33 #include "iq.h"
28667
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
34 #include "chat.h"
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
35
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
36 #include "jingle/jingle.h"
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
37
23704
9b88c9b23aed Use USE_VV instead of USE_FARSIGHT.
Michael Ruprecht <maiku@pidgin.im>
parents: 23700
diff changeset
38 #ifdef USE_VV
23700
e47be56bdd2b Fix compiling with the --disable-vv switch.
Michael Ruprecht <maiku@pidgin.im>
parents: 23697
diff changeset
39
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
40 #define NS_GOOGLE_VIDEO "http://www.google.com/session/video"
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
41 #define NS_GOOGLE_PHONE "http://www.google.com/session/phone"
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
42
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
43 typedef struct {
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
44 char *id;
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
45 char *initiator;
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
46 } GoogleSessionId;
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
47
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
48 typedef enum {
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
49 UNINIT,
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
50 SENT_INITIATE,
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
51 RECEIVED_INITIATE,
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
52 IN_PRORESS,
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
53 TERMINATED
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
54 } GoogleSessionState;
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
55
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
56 typedef struct {
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
57 GoogleSessionId id;
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
58 GoogleSessionState state;
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
59 PurpleMedia *media;
27155
53502d71efdd Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents: 27089
diff changeset
60 JabberStream *js;
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
61 char *remote_jid;
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
62 gboolean video;
28569
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
63 char *iq_id;
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
64 } GoogleSession;
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
65
27155
53502d71efdd Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents: 27089
diff changeset
66 static gboolean
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
67 google_session_id_equal(gconstpointer a, gconstpointer b)
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
68 {
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
69 GoogleSessionId *c = (GoogleSessionId*)a;
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
70 GoogleSessionId *d = (GoogleSessionId*)b;
27155
53502d71efdd Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents: 27089
diff changeset
71
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
72 return !strcmp(c->id, d->id) && !strcmp(c->initiator, d->initiator);
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
73 }
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
74
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
75 static void
19885
593613a22e57 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents: 19882
diff changeset
76 google_session_destroy(GoogleSession *session)
593613a22e57 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents: 19882
diff changeset
77 {
593613a22e57 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents: 19882
diff changeset
78 g_free(session->id.id);
593613a22e57 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents: 19882
diff changeset
79 g_free(session->id.initiator);
593613a22e57 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents: 19882
diff changeset
80 g_free(session->remote_jid);
28569
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
81 g_free(session->iq_id);
19885
593613a22e57 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents: 19882
diff changeset
82 g_free(session);
593613a22e57 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents: 19882
diff changeset
83 }
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
84
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
85 static xmlnode *
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
86 google_session_create_xmlnode(GoogleSession *session, const char *type)
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
87 {
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
88 xmlnode *node = xmlnode_new("session");
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
89 xmlnode_set_namespace(node, "http://www.google.com/session");
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
90 xmlnode_set_attrib(node, "id", session->id.id);
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
91 xmlnode_set_attrib(node, "initiator", session->id.initiator);
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
92 xmlnode_set_attrib(node, "type", type);
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
93 return node;
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
94 }
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
95
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
96 static void
26239
5c186583ab89 Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26238
diff changeset
97 google_session_send_candidates(PurpleMedia *media, gchar *session_id,
26164
20f15fbe9b21 Very basic receive only GTalk audio sessions.
Michael Ruprecht <maiku@pidgin.im>
parents: 26160
diff changeset
98 gchar *participant, GoogleSession *session)
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
99 {
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
100 GList *candidates = purple_media_get_local_candidates(
28656
d003bf9b787e A leak fix in the candidate list, and some code simplification.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 28593
diff changeset
101 session->media, session_id, session->remote_jid), *iter;
26229
3e786c9ebb62 Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents: 26223
diff changeset
102 PurpleMediaCandidate *transport;
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
103 gboolean video = FALSE;
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
104
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
105 if (!strcmp(session_id, "google-video"))
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
106 video = TRUE;
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
107
28656
d003bf9b787e A leak fix in the candidate list, and some code simplification.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 28593
diff changeset
108 for (iter = candidates; iter; iter = iter->next) {
26485
df2f8d35564b Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26484
diff changeset
109 JabberIq *iq;
28593
f6efb49aa838 Generate the "preference" attribute correctly for candidates on locales
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
110 gchar *ip, *port, *username, *password;
f6efb49aa838 Generate the "preference" attribute correctly for candidates on locales
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
111 gchar pref[16];
26620
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
112 PurpleMediaCandidateType type;
26485
df2f8d35564b Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26484
diff changeset
113 xmlnode *sess;
df2f8d35564b Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26484
diff changeset
114 xmlnode *candidate;
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
115 guint component_id;
28656
d003bf9b787e A leak fix in the candidate list, and some code simplification.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 28593
diff changeset
116 transport = PURPLE_MEDIA_CANDIDATE(iter->data);
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
117 component_id = purple_media_candidate_get_component_id(
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
118 transport);
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
119
26485
df2f8d35564b Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26484
diff changeset
120 iq = jabber_iq_new(session->js, JABBER_IQ_SET);
df2f8d35564b Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26484
diff changeset
121 sess = google_session_create_xmlnode(session, "candidates");
df2f8d35564b Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26484
diff changeset
122 xmlnode_insert_child(iq->node, sess);
df2f8d35564b Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26484
diff changeset
123 xmlnode_set_attrib(iq->node, "to", session->remote_jid);
df2f8d35564b Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26484
diff changeset
124
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
125 candidate = xmlnode_new("candidate");
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
126
26620
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
127 ip = purple_media_candidate_get_ip(transport);
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
128 port = g_strdup_printf("%d",
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
129 purple_media_candidate_get_port(transport));
28593
f6efb49aa838 Generate the "preference" attribute correctly for candidates on locales
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
130 g_ascii_dtostr(pref, 16,
f6efb49aa838 Generate the "preference" attribute correctly for candidates on locales
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
131 purple_media_candidate_get_priority(transport) / 1000.0);
26620
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
132 username = purple_media_candidate_get_username(transport);
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
133 password = purple_media_candidate_get_password(transport);
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
134 type = purple_media_candidate_get_candidate_type(transport);
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
135
26620
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
136 xmlnode_set_attrib(candidate, "address", ip);
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
137 xmlnode_set_attrib(candidate, "port", port);
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
138 xmlnode_set_attrib(candidate, "name",
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
139 component_id == PURPLE_MEDIA_COMPONENT_RTP ?
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
140 video ? "video_rtp" : "rtp" :
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
141 component_id == PURPLE_MEDIA_COMPONENT_RTCP ?
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
142 video ? "video_rtcp" : "rtcp" : "none");
26620
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
143 xmlnode_set_attrib(candidate, "username", username);
26201
32baf68eeedd Fix receiving voice calls from Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26199
diff changeset
144 /*
32baf68eeedd Fix receiving voice calls from Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26199
diff changeset
145 * As of this writing, Farsight 2 in Google compatibility
32baf68eeedd Fix receiving voice calls from Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26199
diff changeset
146 * mode doesn't provide a password. The Gmail client
32baf68eeedd Fix receiving voice calls from Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26199
diff changeset
147 * requires this to be set.
32baf68eeedd Fix receiving voice calls from Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26199
diff changeset
148 */
32baf68eeedd Fix receiving voice calls from Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26199
diff changeset
149 xmlnode_set_attrib(candidate, "password",
26620
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
150 password != NULL ? password : "");
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
151 xmlnode_set_attrib(candidate, "preference", pref);
26620
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
152 xmlnode_set_attrib(candidate, "protocol",
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
153 purple_media_candidate_get_protocol(transport)
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
154 == PURPLE_MEDIA_NETWORK_PROTOCOL_UDP ?
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
155 "udp" : "tcp");
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
156 xmlnode_set_attrib(candidate, "type", type ==
26229
3e786c9ebb62 Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents: 26223
diff changeset
157 PURPLE_MEDIA_CANDIDATE_TYPE_HOST ? "local" :
26620
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
158 type ==
26229
3e786c9ebb62 Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents: 26223
diff changeset
159 PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX ? "stun" :
26620
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
160 type ==
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
161 PURPLE_MEDIA_CANDIDATE_TYPE_RELAY ? "relay" :
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
162 NULL);
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
163 xmlnode_set_attrib(candidate, "generation", "0");
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
164 xmlnode_set_attrib(candidate, "network", "0");
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
165 xmlnode_insert_child(sess, candidate);
26485
df2f8d35564b Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26484
diff changeset
166
26620
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
167 g_free(ip);
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
168 g_free(port);
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
169 g_free(username);
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
170 g_free(password);
a34fb2386da5 Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents: 26618
diff changeset
171
26485
df2f8d35564b Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26484
diff changeset
172 jabber_iq_send(iq);
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
173 }
28656
d003bf9b787e A leak fix in the candidate list, and some code simplification.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 28593
diff changeset
174 purple_media_candidate_list_free(candidates);
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
175 }
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
176
19885
593613a22e57 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents: 19882
diff changeset
177 static void
26434
46d8db20a062 Remove ready-new from use.
Michael Ruprecht <maiku@pidgin.im>
parents: 26337
diff changeset
178 google_session_ready(GoogleSession *session)
26205
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
179 {
26434
46d8db20a062 Remove ready-new from use.
Michael Ruprecht <maiku@pidgin.im>
parents: 26337
diff changeset
180 PurpleMedia *media = session->media;
46d8db20a062 Remove ready-new from use.
Michael Ruprecht <maiku@pidgin.im>
parents: 26337
diff changeset
181 if (purple_media_codecs_ready(media, NULL) &&
46d8db20a062 Remove ready-new from use.
Michael Ruprecht <maiku@pidgin.im>
parents: 26337
diff changeset
182 purple_media_candidates_prepared(media, NULL, NULL)) {
26205
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
183 gchar *me = g_strdup_printf("%s@%s/%s",
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
184 session->js->user->node,
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
185 session->js->user->domain,
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
186 session->js->user->resource);
26434
46d8db20a062 Remove ready-new from use.
Michael Ruprecht <maiku@pidgin.im>
parents: 26337
diff changeset
187 JabberIq *iq;
26239
5c186583ab89 Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26238
diff changeset
188 xmlnode *sess, *desc, *payload;
5c186583ab89 Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26238
diff changeset
189 GList *codecs, *iter;
26434
46d8db20a062 Remove ready-new from use.
Michael Ruprecht <maiku@pidgin.im>
parents: 26337
diff changeset
190 gboolean is_initiator = !strcmp(session->id.initiator, me);
26239
5c186583ab89 Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26238
diff changeset
191
26434
46d8db20a062 Remove ready-new from use.
Michael Ruprecht <maiku@pidgin.im>
parents: 26337
diff changeset
192 if (!is_initiator &&
46d8db20a062 Remove ready-new from use.
Michael Ruprecht <maiku@pidgin.im>
parents: 26337
diff changeset
193 !purple_media_accepted(media, NULL, NULL)) {
46d8db20a062 Remove ready-new from use.
Michael Ruprecht <maiku@pidgin.im>
parents: 26337
diff changeset
194 g_free(me);
46d8db20a062 Remove ready-new from use.
Michael Ruprecht <maiku@pidgin.im>
parents: 26337
diff changeset
195 return;
46d8db20a062 Remove ready-new from use.
Michael Ruprecht <maiku@pidgin.im>
parents: 26337
diff changeset
196 }
46d8db20a062 Remove ready-new from use.
Michael Ruprecht <maiku@pidgin.im>
parents: 26337
diff changeset
197
46d8db20a062 Remove ready-new from use.
Michael Ruprecht <maiku@pidgin.im>
parents: 26337
diff changeset
198 iq = jabber_iq_new(session->js, JABBER_IQ_SET);
46d8db20a062 Remove ready-new from use.
Michael Ruprecht <maiku@pidgin.im>
parents: 26337
diff changeset
199
46d8db20a062 Remove ready-new from use.
Michael Ruprecht <maiku@pidgin.im>
parents: 26337
diff changeset
200 if (is_initiator) {
26205
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
201 xmlnode_set_attrib(iq->node, "to", session->remote_jid);
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
202 xmlnode_set_attrib(iq->node, "from", session->id.initiator);
26239
5c186583ab89 Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26238
diff changeset
203 sess = google_session_create_xmlnode(session, "initiate");
5c186583ab89 Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26238
diff changeset
204 } else {
26485
df2f8d35564b Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26484
diff changeset
205 google_session_send_candidates(session->media,
df2f8d35564b Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26484
diff changeset
206 "google-voice", session->remote_jid,
df2f8d35564b Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26484
diff changeset
207 session);
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
208 google_session_send_candidates(session->media,
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
209 "google-video", session->remote_jid,
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
210 session);
26239
5c186583ab89 Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26238
diff changeset
211 xmlnode_set_attrib(iq->node, "to", session->remote_jid);
5c186583ab89 Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26238
diff changeset
212 xmlnode_set_attrib(iq->node, "from", me);
5c186583ab89 Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26238
diff changeset
213 sess = google_session_create_xmlnode(session, "accept");
5c186583ab89 Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26238
diff changeset
214 }
5c186583ab89 Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26238
diff changeset
215 xmlnode_insert_child(iq->node, sess);
5c186583ab89 Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26238
diff changeset
216 desc = xmlnode_new_child(sess, "description");
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
217 if (session->video)
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
218 xmlnode_set_namespace(desc, NS_GOOGLE_VIDEO);
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
219 else
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
220 xmlnode_set_namespace(desc, NS_GOOGLE_PHONE);
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
221
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
222 codecs = purple_media_get_codecs(media, "google-video");
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
223
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
224 for (iter = codecs; iter; iter = g_list_next(iter)) {
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
225 PurpleMediaCodec *codec = (PurpleMediaCodec*)iter->data;
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
226 gchar *id = g_strdup_printf("%d",
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
227 purple_media_codec_get_id(codec));
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
228 gchar *encoding_name =
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
229 purple_media_codec_get_encoding_name(codec);
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
230 payload = xmlnode_new_child(desc, "payload-type");
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
231 xmlnode_set_attrib(payload, "id", id);
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
232 xmlnode_set_attrib(payload, "name", encoding_name);
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
233 xmlnode_set_attrib(payload, "width", "320");
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
234 xmlnode_set_attrib(payload, "height", "200");
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
235 xmlnode_set_attrib(payload, "framerate", "30");
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
236 g_free(encoding_name);
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
237 g_free(id);
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
238 }
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
239 purple_media_codec_list_free(codecs);
26239
5c186583ab89 Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26238
diff changeset
240
5c186583ab89 Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26238
diff changeset
241 codecs = purple_media_get_codecs(media, "google-voice");
26205
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
242
26239
5c186583ab89 Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26238
diff changeset
243 for (iter = codecs; iter; iter = g_list_next(iter)) {
5c186583ab89 Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26238
diff changeset
244 PurpleMediaCodec *codec = (PurpleMediaCodec*)iter->data;
26618
9e9e610ca1a1 Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents: 26514
diff changeset
245 gchar *id = g_strdup_printf("%d",
9e9e610ca1a1 Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents: 26514
diff changeset
246 purple_media_codec_get_id(codec));
9e9e610ca1a1 Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents: 26514
diff changeset
247 gchar *encoding_name =
9e9e610ca1a1 Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents: 26514
diff changeset
248 purple_media_codec_get_encoding_name(codec);
9e9e610ca1a1 Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents: 26514
diff changeset
249 gchar *clock_rate = g_strdup_printf("%d",
9e9e610ca1a1 Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents: 26514
diff changeset
250 purple_media_codec_get_clock_rate(codec));
26239
5c186583ab89 Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26238
diff changeset
251 payload = xmlnode_new_child(desc, "payload-type");
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
252 if (session->video)
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
253 xmlnode_set_namespace(payload, NS_GOOGLE_PHONE);
26239
5c186583ab89 Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26238
diff changeset
254 xmlnode_set_attrib(payload, "id", id);
27203
f11c3c9a7f53 Make Gmail accept speex as the codec.
Michael Ruprecht <maiku@pidgin.im>
parents: 27202
diff changeset
255 /*
f11c3c9a7f53 Make Gmail accept speex as the codec.
Michael Ruprecht <maiku@pidgin.im>
parents: 27202
diff changeset
256 * Hack to make Gmail accept speex as the codec.
f11c3c9a7f53 Make Gmail accept speex as the codec.
Michael Ruprecht <maiku@pidgin.im>
parents: 27202
diff changeset
257 * It shouldn't have to be case sensitive.
f11c3c9a7f53 Make Gmail accept speex as the codec.
Michael Ruprecht <maiku@pidgin.im>
parents: 27202
diff changeset
258 */
f11c3c9a7f53 Make Gmail accept speex as the codec.
Michael Ruprecht <maiku@pidgin.im>
parents: 27202
diff changeset
259 if (purple_strequal(encoding_name, "SPEEX"))
f11c3c9a7f53 Make Gmail accept speex as the codec.
Michael Ruprecht <maiku@pidgin.im>
parents: 27202
diff changeset
260 xmlnode_set_attrib(payload, "name", "speex");
f11c3c9a7f53 Make Gmail accept speex as the codec.
Michael Ruprecht <maiku@pidgin.im>
parents: 27202
diff changeset
261 else
f11c3c9a7f53 Make Gmail accept speex as the codec.
Michael Ruprecht <maiku@pidgin.im>
parents: 27202
diff changeset
262 xmlnode_set_attrib(payload, "name", encoding_name);
26239
5c186583ab89 Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26238
diff changeset
263 xmlnode_set_attrib(payload, "clockrate", clock_rate);
5c186583ab89 Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26238
diff changeset
264 g_free(clock_rate);
26618
9e9e610ca1a1 Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents: 26514
diff changeset
265 g_free(encoding_name);
26239
5c186583ab89 Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26238
diff changeset
266 g_free(id);
5c186583ab89 Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26238
diff changeset
267 }
5c186583ab89 Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26238
diff changeset
268 purple_media_codec_list_free(codecs);
26205
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
269
26239
5c186583ab89 Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26238
diff changeset
270 jabber_iq_send(iq);
5c186583ab89 Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26238
diff changeset
271
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
272 if (is_initiator) {
26485
df2f8d35564b Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26484
diff changeset
273 google_session_send_candidates(session->media,
df2f8d35564b Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26484
diff changeset
274 "google-voice", session->remote_jid,
df2f8d35564b Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26484
diff changeset
275 session);
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
276 google_session_send_candidates(session->media,
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
277 "google-video", session->remote_jid,
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
278 session);
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
279 }
26438
786a8c41d80f Don't let initiate or accept be sent again with Google Voice.
Michael Ruprecht <maiku@pidgin.im>
parents: 26434
diff changeset
280
786a8c41d80f Don't let initiate or accept be sent again with Google Voice.
Michael Ruprecht <maiku@pidgin.im>
parents: 26434
diff changeset
281 g_signal_handlers_disconnect_by_func(G_OBJECT(session->media),
786a8c41d80f Don't let initiate or accept be sent again with Google Voice.
Michael Ruprecht <maiku@pidgin.im>
parents: 26434
diff changeset
282 G_CALLBACK(google_session_ready), session);
26205
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
283 }
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
284 }
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
285
26238
544a16676559 Use the state-changed signal in GTalk code.
Michael Ruprecht <maiku@pidgin.im>
parents: 26232
diff changeset
286 static void
26449
9e381dc6ed24 Rename state-changed enum and values.
Michael Ruprecht <maiku@pidgin.im>
parents: 26443
diff changeset
287 google_session_state_changed_cb(PurpleMedia *media, PurpleMediaState state,
26238
544a16676559 Use the state-changed signal in GTalk code.
Michael Ruprecht <maiku@pidgin.im>
parents: 26232
diff changeset
288 gchar *sid, gchar *name, GoogleSession *session)
544a16676559 Use the state-changed signal in GTalk code.
Michael Ruprecht <maiku@pidgin.im>
parents: 26232
diff changeset
289 {
544a16676559 Use the state-changed signal in GTalk code.
Michael Ruprecht <maiku@pidgin.im>
parents: 26232
diff changeset
290 if (sid == NULL && name == NULL) {
26449
9e381dc6ed24 Rename state-changed enum and values.
Michael Ruprecht <maiku@pidgin.im>
parents: 26443
diff changeset
291 if (state == PURPLE_MEDIA_STATE_END) {
26238
544a16676559 Use the state-changed signal in GTalk code.
Michael Ruprecht <maiku@pidgin.im>
parents: 26232
diff changeset
292 google_session_destroy(session);
26442
b68f5a57853a Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26438
diff changeset
293 }
b68f5a57853a Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26438
diff changeset
294 }
b68f5a57853a Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26438
diff changeset
295 }
b68f5a57853a Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26438
diff changeset
296
b68f5a57853a Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26438
diff changeset
297 static void
26443
511064e5b314 Use the right enum for the parameter.
Michael Ruprecht <maiku@pidgin.im>
parents: 26442
diff changeset
298 google_session_stream_info_cb(PurpleMedia *media, PurpleMediaInfoType type,
26496
11e1e5221460 Create purple_media_stream_info. Add local parameter to stream-info signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26495
diff changeset
299 gchar *sid, gchar *name, gboolean local,
11e1e5221460 Create purple_media_stream_info. Add local parameter to stream-info signal.
Michael Ruprecht <maiku@pidgin.im>
parents: 26495
diff changeset
300 GoogleSession *session)
26442
b68f5a57853a Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26438
diff changeset
301 {
28372
2e425d79d30b Handle the local accept signal with GTalk/Gmail. This was causing calls
Michael Ruprecht <maiku@pidgin.im>
parents: 28329
diff changeset
302 if (sid != NULL || name != NULL)
2e425d79d30b Handle the local accept signal with GTalk/Gmail. This was causing calls
Michael Ruprecht <maiku@pidgin.im>
parents: 28329
diff changeset
303 return;
2e425d79d30b Handle the local accept signal with GTalk/Gmail. This was causing calls
Michael Ruprecht <maiku@pidgin.im>
parents: 28329
diff changeset
304
26442
b68f5a57853a Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26438
diff changeset
305 if (type == PURPLE_MEDIA_INFO_HANGUP) {
b68f5a57853a Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26438
diff changeset
306 xmlnode *sess;
b68f5a57853a Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26438
diff changeset
307 JabberIq *iq = jabber_iq_new(session->js, JABBER_IQ_SET);
26238
544a16676559 Use the state-changed signal in GTalk code.
Michael Ruprecht <maiku@pidgin.im>
parents: 26232
diff changeset
308
26442
b68f5a57853a Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26438
diff changeset
309 xmlnode_set_attrib(iq->node, "to", session->remote_jid);
b68f5a57853a Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26438
diff changeset
310 sess = google_session_create_xmlnode(session, "terminate");
b68f5a57853a Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26438
diff changeset
311 xmlnode_insert_child(iq->node, sess);
26238
544a16676559 Use the state-changed signal in GTalk code.
Michael Ruprecht <maiku@pidgin.im>
parents: 26232
diff changeset
312
26442
b68f5a57853a Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26438
diff changeset
313 jabber_iq_send(iq);
b68f5a57853a Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26438
diff changeset
314 } else if (type == PURPLE_MEDIA_INFO_REJECT) {
b68f5a57853a Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26438
diff changeset
315 xmlnode *sess;
b68f5a57853a Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26438
diff changeset
316 JabberIq *iq = jabber_iq_new(session->js, JABBER_IQ_SET);
b68f5a57853a Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26438
diff changeset
317
b68f5a57853a Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26438
diff changeset
318 xmlnode_set_attrib(iq->node, "to", session->remote_jid);
b68f5a57853a Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26438
diff changeset
319 sess = google_session_create_xmlnode(session, "reject");
b68f5a57853a Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26438
diff changeset
320 xmlnode_insert_child(iq->node, sess);
b68f5a57853a Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26438
diff changeset
321
b68f5a57853a Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents: 26438
diff changeset
322 jabber_iq_send(iq);
28372
2e425d79d30b Handle the local accept signal with GTalk/Gmail. This was causing calls
Michael Ruprecht <maiku@pidgin.im>
parents: 28329
diff changeset
323 } else if (type == PURPLE_MEDIA_INFO_ACCEPT && local == TRUE) {
2e425d79d30b Handle the local accept signal with GTalk/Gmail. This was causing calls
Michael Ruprecht <maiku@pidgin.im>
parents: 28329
diff changeset
324 google_session_ready(session);
26238
544a16676559 Use the state-changed signal in GTalk code.
Michael Ruprecht <maiku@pidgin.im>
parents: 26232
diff changeset
325 }
544a16676559 Use the state-changed signal in GTalk code.
Michael Ruprecht <maiku@pidgin.im>
parents: 26232
diff changeset
326 }
544a16676559 Use the state-changed signal in GTalk code.
Michael Ruprecht <maiku@pidgin.im>
parents: 26232
diff changeset
327
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
328 static GParameter *
28567
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
329 jabber_google_session_get_params(JabberStream *js, const gchar *relay_ip,
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
330 guint16 relay_udp, guint16 relay_tcp, guint16 relay_ssltcp,
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
331 const gchar *relay_username, const gchar *relay_password, guint *num)
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
332 {
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
333 guint num_params;
28567
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
334 GParameter *params =
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
335 jingle_get_params(js, relay_ip, relay_udp, relay_tcp, relay_ssltcp,
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
336 relay_username, relay_password, &num_params);
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
337 GParameter *new_params = g_new0(GParameter, num_params + 1);
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
338
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
339 memcpy(new_params, params, sizeof(GParameter) * num_params);
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
340
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
341 purple_debug_info("jabber", "setting Google jingle compatibility param\n");
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
342 new_params[num_params].name = "compatibility-mode";
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
343 g_value_init(&new_params[num_params].value, G_TYPE_UINT);
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
344 g_value_set_uint(&new_params[num_params].value, 1); /* NICE_COMPATIBILITY_GOOGLE */
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
345
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
346 g_free(params);
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
347 *num = num_params + 1;
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
348 return new_params;
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
349 }
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
350
28445
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
351 static void
28567
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
352 jabber_google_relay_parse_response(const gchar *response, gchar **ip,
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
353 guint *udp, guint *tcp, guint *ssltcp, gchar **username, gchar **password)
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
354 {
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
355 gchar **lines = g_strsplit(response, "\n", -1);
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
356 int i = 0;
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
357
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
358 for (; lines[i] ; i++) {
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
359 gchar *line = lines[i];
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
360 gchar **parts = g_strsplit(line, "=", 2);
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
361
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
362 if (parts[0] && parts[1]) {
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
363 if (purple_strequal(parts[0], "relay.ip")) {
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
364 *ip = g_strdup(parts[1]);
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
365 } else if (purple_strequal(parts[0], "relay.udp_port")) {
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
366 *udp = atoi(parts[1]);
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
367 } else if (purple_strequal(parts[0], "relay.tcp_port")) {
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
368 *tcp = atoi(parts[1]);
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
369 } else if (purple_strequal(parts[0], "relay.ssltcp_port")) {
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
370 *ssltcp = atoi(parts[1]);
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
371 } else if (purple_strequal(parts[0], "username")) {
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
372 *username = g_strdup(parts[1]);
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
373 } else if (purple_strequal(parts[0], "password")) {
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
374 *password = g_strdup(parts[1]);
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
375 }
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
376 }
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
377 g_strfreev(parts);
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
378 }
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
379
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
380 g_strfreev(lines);
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
381 }
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
382
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
383 static void
28597
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
384 jabber_google_relay_remove_url_data(JabberStream *js,
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
385 PurpleUtilFetchUrlData *url_data)
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
386 {
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
387 GList *iter = js->google_relay_requests;
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
388
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
389 while (iter) {
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
390 if (iter->data == url_data) {
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
391 js->google_relay_requests =
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
392 g_list_delete_link(js->google_relay_requests, iter);
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
393 break;
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
394 }
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
395 }
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
396 }
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
397
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
398 static void
28569
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
399 jabber_google_relay_response_session_initiate_cb(PurpleUtilFetchUrlData *url_data,
28445
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
400 gpointer user_data, const gchar *url_text, gsize len,
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
401 const gchar *error_message)
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
402 {
28445
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
403 GoogleSession *session = (GoogleSession *) user_data;
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
404 GParameter *params;
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
405 guint num_params;
28445
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
406 JabberStream *js = session->js;
28567
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
407 gchar *relay_ip = NULL;
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
408 guint relay_udp = 0;
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
409 guint relay_tcp = 0;
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
410 guint relay_ssltcp = 0;
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
411 gchar *relay_username = NULL;
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
412 gchar *relay_password = NULL;
26205
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
413
28597
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
414 if (url_data) {
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
415 jabber_google_relay_remove_url_data(js, url_data);
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
416 }
28445
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
417
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
418 purple_debug_info("jabber", "got response on HTTP request to relay server\n");
26205
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
419
28445
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
420 if (url_text && len > 0) {
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
421 purple_debug_info("jabber", "got Google relay request response:\n%s\n",
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
422 url_text);
28567
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
423 jabber_google_relay_parse_response(url_text, &relay_ip, &relay_udp,
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
424 &relay_tcp, &relay_ssltcp, &relay_username, &relay_password);
26205
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
425 }
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
426
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
427 session->media = purple_media_manager_create_media(
26746
2a2d45ac9774 Switch media to store accounts rather than connections.
Michael Ruprecht <maiku@pidgin.im>
parents: 26698
diff changeset
428 purple_media_manager_get(),
2a2d45ac9774 Switch media to store accounts rather than connections.
Michael Ruprecht <maiku@pidgin.im>
parents: 26698
diff changeset
429 purple_connection_get_account(js->gc),
26205
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
430 "fsrtpconference", session->remote_jid, TRUE);
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
431
26331
d5ebef68c29d Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents: 26286
diff changeset
432 purple_media_set_prpl_data(session->media, session);
d5ebef68c29d Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents: 26286
diff changeset
433
28329
0300f09b9cd6 Gracefully handle failures to create an FsStream. This was caused by
Michael Ruprecht <maiku@pidgin.im>
parents: 28318
diff changeset
434 g_signal_connect_swapped(G_OBJECT(session->media),
0300f09b9cd6 Gracefully handle failures to create an FsStream. This was caused by
Michael Ruprecht <maiku@pidgin.im>
parents: 28318
diff changeset
435 "candidates-prepared",
0300f09b9cd6 Gracefully handle failures to create an FsStream. This was caused by
Michael Ruprecht <maiku@pidgin.im>
parents: 28318
diff changeset
436 G_CALLBACK(google_session_ready), session);
0300f09b9cd6 Gracefully handle failures to create an FsStream. This was caused by
Michael Ruprecht <maiku@pidgin.im>
parents: 28318
diff changeset
437 g_signal_connect_swapped(G_OBJECT(session->media), "codecs-changed",
0300f09b9cd6 Gracefully handle failures to create an FsStream. This was caused by
Michael Ruprecht <maiku@pidgin.im>
parents: 28318
diff changeset
438 G_CALLBACK(google_session_ready), session);
0300f09b9cd6 Gracefully handle failures to create an FsStream. This was caused by
Michael Ruprecht <maiku@pidgin.im>
parents: 28318
diff changeset
439 g_signal_connect(G_OBJECT(session->media), "state-changed",
0300f09b9cd6 Gracefully handle failures to create an FsStream. This was caused by
Michael Ruprecht <maiku@pidgin.im>
parents: 28318
diff changeset
440 G_CALLBACK(google_session_state_changed_cb), session);
0300f09b9cd6 Gracefully handle failures to create an FsStream. This was caused by
Michael Ruprecht <maiku@pidgin.im>
parents: 28318
diff changeset
441 g_signal_connect(G_OBJECT(session->media), "stream-info",
0300f09b9cd6 Gracefully handle failures to create an FsStream. This was caused by
Michael Ruprecht <maiku@pidgin.im>
parents: 28318
diff changeset
442 G_CALLBACK(google_session_stream_info_cb), session);
0300f09b9cd6 Gracefully handle failures to create an FsStream. This was caused by
Michael Ruprecht <maiku@pidgin.im>
parents: 28318
diff changeset
443
28567
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
444 params =
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
445 jabber_google_session_get_params(js, relay_ip, relay_udp, relay_tcp,
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
446 relay_ssltcp, relay_username, relay_password, &num_params);
26205
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
447
28567
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
448 g_free(relay_ip);
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
449 g_free(relay_username);
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
450 g_free(relay_password);
b5ea98ed9e32 Can now generate a relayed candidate for the initiator
Marcus Lundblad <malu@pidgin.im>
parents: 28566
diff changeset
451
26205
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
452 if (purple_media_add_stream(session->media, "google-voice",
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
453 session->remote_jid, PURPLE_MEDIA_AUDIO,
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
454 TRUE, "nice", num_params, params) == FALSE ||
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
455 (session->video && purple_media_add_stream(
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
456 session->media, "google-video",
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
457 session->remote_jid, PURPLE_MEDIA_VIDEO,
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
458 TRUE, "nice", num_params, params) == FALSE)) {
26205
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
459 purple_media_error(session->media, "Error adding stream.");
28329
0300f09b9cd6 Gracefully handle failures to create an FsStream. This was caused by
Michael Ruprecht <maiku@pidgin.im>
parents: 28318
diff changeset
460 purple_media_end(session->media, NULL, NULL);
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
461 g_free(params);
26205
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
462 }
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
463
28445
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
464 g_free(params);
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
465 }
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
466
28569
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
467 static void
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
468 jabber_google_do_relay_request(JabberStream *js, GoogleSession *session,
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
469 PurpleUtilFetchUrlCallback cb)
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
470 {
28597
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
471 PurpleUtilFetchUrlData *url_data = NULL;
28569
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
472 gchar *url = g_strdup_printf("http://%s", js->google_relay_host);
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
473 gchar *request =
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
474 g_strdup_printf("GET /create_session HTTP/1.0\r\n"
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
475 "Host: %s\r\n"
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
476 "X-Talk-Google-Relay-Auth: %s\r\n"
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
477 "X-Google-Relay-Auth: %s\r\n\r\n",
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
478 js->google_relay_host, js->google_relay_token, js->google_relay_token);
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
479 purple_debug_info("jabber",
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
480 "sending Google relay request %s to %s\n", request, url);
28597
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
481 url_data =
28569
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
482 purple_util_fetch_url_request(url, FALSE, NULL, FALSE, request, FALSE,
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
483 cb, session);
28597
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
484 if (url_data) {
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
485 js->google_relay_requests =
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
486 g_list_prepend(js->google_relay_requests, url_data);
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
487 } else {
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
488 purple_debug_error("jabber", "unable to create Google relay request\n");
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
489 cb(NULL, session, NULL, 0, NULL);
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
490 }
28569
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
491 g_free(url);
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
492 g_free(request);
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
493 }
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
494
28445
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
495 gboolean
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
496 jabber_google_session_initiate(JabberStream *js, const gchar *who, PurpleMediaSessionType type)
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
497 {
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
498 GoogleSession *session;
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
499 JabberBuddy *jb;
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
500 JabberBuddyResource *jbr;
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
501 gchar *jid;
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
502
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
503 /* construct JID to send to */
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
504 jb = jabber_buddy_find(js, who, FALSE);
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
505 if (!jb) {
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
506 purple_debug_error("jingle-rtp",
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
507 "Could not find Jabber buddy\n");
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
508 return FALSE;
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
509 }
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
510 jbr = jabber_buddy_find_resource(jb, NULL);
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
511 if (!jbr) {
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
512 purple_debug_error("jingle-rtp",
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
513 "Could not find buddy's resource\n");
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
514 }
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
515
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
516 if ((strchr(who, '/') == NULL) && jbr && (jbr->name != NULL)) {
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
517 jid = g_strdup_printf("%s/%s", who, jbr->name);
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
518 } else {
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
519 jid = g_strdup(who);
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
520 }
26205
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
521
28445
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
522 session = g_new0(GoogleSession, 1);
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
523 session->id.id = jabber_get_next_id(js);
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
524 session->id.initiator = g_strdup_printf("%s@%s/%s", js->user->node,
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
525 js->user->domain, js->user->resource);
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
526 session->state = SENT_INITIATE;
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
527 session->js = js;
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
528 session->remote_jid = jid;
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
529
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
530 if (type & PURPLE_MEDIA_VIDEO)
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
531 session->video = TRUE;
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
532
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
533 /* if we got a relay token and relay host in google:jingleinfo, issue an
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
534 HTTP request to get that data */
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
535 if (js->google_relay_host && js->google_relay_token) {
28569
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
536 jabber_google_do_relay_request(js, session,
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
537 jabber_google_relay_response_session_initiate_cb);
28445
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
538 } else {
28569
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
539 jabber_google_relay_response_session_initiate_cb(NULL, session, NULL, 0,
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
540 NULL);
28445
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
541 }
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
542
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
543 /* we don't actually know yet wether it succeeded... maybe this is very
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
544 wrong... */
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
545 return TRUE;
26205
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
546 }
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
547
28569
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
548 static void
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
549 jabber_google_relay_response_session_handle_initiate_cb(
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
550 PurpleUtilFetchUrlData *url_data,
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
551 gpointer user_data, const gchar *url_text, gsize len,
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
552 const gchar *error_message)
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
553 {
28569
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
554 GoogleSession *session = (GoogleSession *) user_data;
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
555 GParameter *params;
27155
53502d71efdd Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents: 27089
diff changeset
556 guint num_params;
28569
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
557 JabberStream *js = session->js;
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
558 gchar *relay_ip = NULL;
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
559 guint relay_udp = 0;
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
560 guint relay_tcp = 0;
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
561 guint relay_ssltcp = 0;
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
562 gchar *relay_username = NULL;
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
563 gchar *relay_password = NULL;
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
564 xmlnode *codec_element;
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
565 xmlnode *desc_element;
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
566 const gchar *xmlns;
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
567 PurpleMediaCodec *codec;
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
568 GList *video_codecs = NULL;
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
569 GList *codecs = NULL;
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
570 JabberIq *result;
28570
3f2c959e511c Cancel ongoing Google relay request when signing out
Marcus Lundblad <malu@pidgin.im>
parents: 28569
diff changeset
571
28597
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
572 if (url_data) {
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
573 jabber_google_relay_remove_url_data(js, url_data);
0e06c97202e9 Keep track of more than one relay request at a time (this is probably not
Marcus Lundblad <malu@pidgin.im>
parents: 28596
diff changeset
574 }
28570
3f2c959e511c Cancel ongoing Google relay request when signing out
Marcus Lundblad <malu@pidgin.im>
parents: 28569
diff changeset
575
28569
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
576 if (url_text && len > 0) {
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
577 purple_debug_info("jabber", "got Google relay request response:\n%s\n",
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
578 url_text);
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
579 jabber_google_relay_parse_response(url_text, &relay_ip, &relay_udp,
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
580 &relay_tcp, &relay_ssltcp, &relay_username, &relay_password);
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
581 }
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
582
28569
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
583 params =
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
584 jabber_google_session_get_params(js, relay_ip, relay_udp, relay_tcp,
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
585 relay_ssltcp, relay_username, relay_password, &num_params);
26164
20f15fbe9b21 Very basic receive only GTalk audio sessions.
Michael Ruprecht <maiku@pidgin.im>
parents: 26160
diff changeset
586
26514
058053cffc0e Add purple_media_is_initiator.
Michael Ruprecht <maiku@pidgin.im>
parents: 26501
diff changeset
587 if (purple_media_add_stream(session->media, "google-voice",
058053cffc0e Add purple_media_is_initiator.
Michael Ruprecht <maiku@pidgin.im>
parents: 26501
diff changeset
588 session->remote_jid, PURPLE_MEDIA_AUDIO, FALSE,
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
589 "nice", num_params, params) == FALSE ||
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
590 (session->video && purple_media_add_stream(
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
591 session->media, "google-video",
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
592 session->remote_jid, PURPLE_MEDIA_VIDEO,
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
593 FALSE, "nice", num_params, params) == FALSE)) {
26199
a5530443b54d End google call if stream creation fails.
Michael Ruprecht <maiku@pidgin.im>
parents: 26187
diff changeset
594 purple_media_error(session->media, "Error adding stream.");
26499
759bf410db86 Remove purple_media_hangup.
Michael Ruprecht <maiku@pidgin.im>
parents: 26496
diff changeset
595 purple_media_stream_info(session->media,
28329
0300f09b9cd6 Gracefully handle failures to create an FsStream. This was caused by
Michael Ruprecht <maiku@pidgin.im>
parents: 28318
diff changeset
596 PURPLE_MEDIA_INFO_REJECT, NULL, NULL, TRUE);
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
597 g_free(params);
26199
a5530443b54d End google call if stream creation fails.
Michael Ruprecht <maiku@pidgin.im>
parents: 26187
diff changeset
598 }
23697
299bafcd8eb8 Updates voice and video to use Farsight 2, gets XMPP voice conferences
Michael Ruprecht <maiku@pidgin.im>
parents: 22648
diff changeset
599
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
600 g_free(params);
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
601
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
602 for (codec_element = xmlnode_get_child(desc_element, "payload-type");
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
603 codec_element; codec_element = codec_element->next) {
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
604 const char *id, *encoding_name, *clock_rate,
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
605 *width, *height, *framerate;
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
606 gboolean video;
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
607 if (codec_element->name &&
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
608 strcmp(codec_element->name, "payload-type"))
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
609 continue;
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
610
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
611 xmlns = xmlnode_get_namespace(codec_element);
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
612 encoding_name = xmlnode_get_attrib(codec_element, "name");
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
613 id = xmlnode_get_attrib(codec_element, "id");
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
614
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
615 if (!session->video ||
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
616 (xmlns && !strcmp(xmlns, NS_GOOGLE_PHONE))) {
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
617 clock_rate = xmlnode_get_attrib(
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
618 codec_element, "clockrate");
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
619 video = FALSE;
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
620 } else {
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
621 width = xmlnode_get_attrib(codec_element, "width");
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
622 height = xmlnode_get_attrib(codec_element, "height");
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
623 framerate = xmlnode_get_attrib(
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
624 codec_element, "framerate");
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
625 clock_rate = "90000";
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
626 video = TRUE;
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
627 }
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
628
26981
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
629 if (id) {
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
630 codec = purple_media_codec_new(atoi(id), encoding_name,
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
631 video ? PURPLE_MEDIA_VIDEO :
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
632 PURPLE_MEDIA_AUDIO,
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
633 clock_rate ? atoi(clock_rate) : 0);
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
634 if (video)
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
635 video_codecs = g_list_append(
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
636 video_codecs, codec);
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
637 else
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
638 codecs = g_list_append(codecs, codec);
26981
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
639 }
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
640 }
19885
593613a22e57 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents: 19882
diff changeset
641
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
642 if (codecs)
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
643 purple_media_set_remote_codecs(session->media, "google-voice",
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
644 session->remote_jid, codecs);
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
645 if (video_codecs)
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
646 purple_media_set_remote_codecs(session->media, "google-video",
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
647 session->remote_jid, video_codecs);
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
648
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
649 purple_media_codec_list_free(codecs);
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
650 purple_media_codec_list_free(video_codecs);
19885
593613a22e57 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents: 19882
diff changeset
651
593613a22e57 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents: 19882
diff changeset
652 result = jabber_iq_new(js, JABBER_IQ_RESULT);
28569
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
653 jabber_iq_set_id(result, session->iq_id);
19885
593613a22e57 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents: 19882
diff changeset
654 xmlnode_set_attrib(result->node, "to", session->remote_jid);
593613a22e57 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents: 19882
diff changeset
655 jabber_iq_send(result);
28569
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
656 }
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
657
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
658 static gboolean
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
659 google_session_handle_initiate(JabberStream *js, GoogleSession *session, xmlnode *sess, const char *iq_id)
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
660 {
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
661 xmlnode *desc_element;
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
662 const gchar *xmlns;
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
663
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
664 if (session->state != UNINIT) {
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
665 purple_debug_error("jabber", "Received initiate for active session.\n");
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
666 return FALSE;
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
667 }
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
668
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
669 desc_element = xmlnode_get_child(sess, "description");
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
670 xmlns = xmlnode_get_namespace(desc_element);
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
671
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
672 if (purple_strequal(xmlns, NS_GOOGLE_PHONE))
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
673 session->video = FALSE;
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
674 else if (purple_strequal(xmlns, NS_GOOGLE_VIDEO))
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
675 session->video = TRUE;
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
676 else {
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
677 purple_debug_error("jabber", "Received initiate with "
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
678 "invalid namespace %s.\n", xmlns);
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
679 return FALSE;
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
680 }
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
681
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
682 session->media = purple_media_manager_create_media(
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
683 purple_media_manager_get(),
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
684 purple_connection_get_account(js->gc),
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
685 "fsrtpconference", session->remote_jid, FALSE);
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
686
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
687 purple_media_set_prpl_data(session->media, session);
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
688
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
689 g_signal_connect_swapped(G_OBJECT(session->media),
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
690 "candidates-prepared",
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
691 G_CALLBACK(google_session_ready), session);
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
692 g_signal_connect_swapped(G_OBJECT(session->media), "codecs-changed",
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
693 G_CALLBACK(google_session_ready), session);
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
694 g_signal_connect(G_OBJECT(session->media), "state-changed",
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
695 G_CALLBACK(google_session_state_changed_cb), session);
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
696 g_signal_connect(G_OBJECT(session->media), "stream-info",
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
697 G_CALLBACK(google_session_stream_info_cb), session);
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
698
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
699 session->iq_id = g_strdup(iq_id);
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
700
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
701 if (js->google_relay_host && js->google_relay_token) {
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
702 jabber_google_do_relay_request(js, session,
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
703 jabber_google_relay_response_session_handle_initiate_cb);
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
704 } else {
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
705 jabber_google_relay_response_session_handle_initiate_cb(NULL, session,
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
706 NULL, 0, NULL);
3f1147d1b4a4 The receiver can now generate relayed candidates
Marcus Lundblad <malu@pidgin.im>
parents: 28567
diff changeset
707 }
28076
796f5a14f70b Fix a bunch of memory leaks reported by Josh Mueller. Refs #9822.
Paul Aurich <darkrain42@pidgin.im>
parents: 27950
diff changeset
708
796f5a14f70b Fix a bunch of memory leaks reported by Josh Mueller. Refs #9822.
Paul Aurich <darkrain42@pidgin.im>
parents: 27950
diff changeset
709 return TRUE;
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
710 }
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
711
27155
53502d71efdd Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents: 27089
diff changeset
712 static void
26698
417e1c82963b And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents: 26693
diff changeset
713 google_session_handle_candidates(JabberStream *js, GoogleSession *session, xmlnode *sess, const char *iq_id)
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
714 {
19885
593613a22e57 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents: 19882
diff changeset
715 JabberIq *result;
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
716 GList *list = NULL, *video_list = NULL;
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
717 xmlnode *cand;
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
718 static int name = 0;
27155
53502d71efdd Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents: 27089
diff changeset
719 char n[4];
53502d71efdd Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents: 27089
diff changeset
720
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
721 for (cand = xmlnode_get_child(sess, "candidate"); cand;
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
722 cand = xmlnode_get_next_twin(cand)) {
26229
3e786c9ebb62 Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents: 26223
diff changeset
723 PurpleMediaCandidate *info;
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
724 const gchar *cname = xmlnode_get_attrib(cand, "name");
26981
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
725 const gchar *type = xmlnode_get_attrib(cand, "type");
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
726 const gchar *protocol = xmlnode_get_attrib(cand, "protocol");
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
727 const gchar *address = xmlnode_get_attrib(cand, "address");
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
728 const gchar *port = xmlnode_get_attrib(cand, "port");
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
729 guint component_id;
26981
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
730
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
731 if (cname && type && address && port) {
26981
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
732 PurpleMediaCandidateType candidate_type;
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
733
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
734 g_snprintf(n, sizeof(n), "S%d", name++);
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
735
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
736 if (g_str_equal(type, "local"))
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
737 candidate_type = PURPLE_MEDIA_CANDIDATE_TYPE_HOST;
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
738 else if (g_str_equal(type, "stun"))
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
739 candidate_type = PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX;
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
740 else if (g_str_equal(type, "relay"))
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
741 candidate_type = PURPLE_MEDIA_CANDIDATE_TYPE_RELAY;
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
742 else
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
743 candidate_type = PURPLE_MEDIA_CANDIDATE_TYPE_HOST;
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
744
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
745 if (purple_strequal(cname, "rtcp") ||
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
746 purple_strequal(cname, "video_rtcp"))
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
747 component_id = PURPLE_MEDIA_COMPONENT_RTCP;
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
748 else
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
749 component_id = PURPLE_MEDIA_COMPONENT_RTP;
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
750
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
751 info = purple_media_candidate_new(n, component_id,
26981
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
752 candidate_type,
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
753 purple_strequal(protocol, "udp") ?
26229
3e786c9ebb62 Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents: 26223
diff changeset
754 PURPLE_MEDIA_NETWORK_PROTOCOL_UDP :
3e786c9ebb62 Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents: 26223
diff changeset
755 PURPLE_MEDIA_NETWORK_PROTOCOL_TCP,
26981
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
756 address,
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
757 atoi(port));
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
758 g_object_set(info, "username", xmlnode_get_attrib(cand, "username"),
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
759 "password", xmlnode_get_attrib(cand, "password"), NULL);
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
760 if (!strncmp(cname, "video_", 6))
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
761 video_list = g_list_append(video_list, info);
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
762 else
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
763 list = g_list_append(list, info);
26981
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
764 }
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
765 }
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
766
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
767 if (list)
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
768 purple_media_add_remote_candidates(
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
769 session->media, "google-voice",
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
770 session->remote_jid, list);
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
771 if (video_list)
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
772 purple_media_add_remote_candidates(
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
773 session->media, "google-video",
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
774 session->remote_jid, video_list);
26229
3e786c9ebb62 Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents: 26223
diff changeset
775 purple_media_candidate_list_free(list);
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
776 purple_media_candidate_list_free(video_list);
19885
593613a22e57 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents: 19882
diff changeset
777
593613a22e57 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents: 19882
diff changeset
778 result = jabber_iq_new(js, JABBER_IQ_RESULT);
26698
417e1c82963b And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents: 26693
diff changeset
779 jabber_iq_set_id(result, iq_id);
19885
593613a22e57 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents: 19882
diff changeset
780 xmlnode_set_attrib(result->node, "to", session->remote_jid);
593613a22e57 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents: 19882
diff changeset
781 jabber_iq_send(result);
593613a22e57 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents: 19882
diff changeset
782 }
593613a22e57 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents: 19882
diff changeset
783
593613a22e57 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents: 19882
diff changeset
784 static void
26698
417e1c82963b And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents: 26693
diff changeset
785 google_session_handle_accept(JabberStream *js, GoogleSession *session, xmlnode *sess, const char *iq_id)
26205
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
786 {
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
787 xmlnode *desc_element = xmlnode_get_child(sess, "description");
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
788 xmlnode *codec_element = xmlnode_get_child(
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
789 desc_element, "payload-type");
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
790 GList *codecs = NULL, *video_codecs = NULL;
26484
131c5b5bcf61 Fix Gtalk bug where it would terminate the session after 15 seconds.
Michael Ruprecht <maiku@pidgin.im>
parents: 26454
diff changeset
791 JabberIq *result = NULL;
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
792 const gchar *xmlns = xmlnode_get_namespace(desc_element);
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
793 gboolean video = (xmlns && !strcmp(xmlns, NS_GOOGLE_VIDEO));
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
794
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
795 for (; codec_element; codec_element = codec_element->next) {
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
796 const gchar *xmlns, *encoding_name, *id,
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
797 *clock_rate, *width, *height, *framerate;
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
798 gboolean video_codec = FALSE;
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
799
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
800 if (!purple_strequal(codec_element->name, "payload-type"))
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
801 continue;
26205
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
802
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
803 xmlns = xmlnode_get_namespace(codec_element);
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
804 encoding_name = xmlnode_get_attrib(codec_element, "name");
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
805 id = xmlnode_get_attrib(codec_element, "id");
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
806
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
807 if (!video || purple_strequal(xmlns, NS_GOOGLE_PHONE))
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
808 clock_rate = xmlnode_get_attrib(
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
809 codec_element, "clockrate");
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
810 else {
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
811 clock_rate = "90000";
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
812 width = xmlnode_get_attrib(codec_element, "width");
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
813 height = xmlnode_get_attrib(codec_element, "height");
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
814 framerate = xmlnode_get_attrib(
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
815 codec_element, "framerate");
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
816 video_codec = TRUE;
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
817 }
26205
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
818
26981
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
819 if (id && encoding_name) {
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
820 PurpleMediaCodec *codec = purple_media_codec_new(
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
821 atoi(id), encoding_name,
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
822 video_codec ? PURPLE_MEDIA_VIDEO :
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
823 PURPLE_MEDIA_AUDIO,
26981
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
824 clock_rate ? atoi(clock_rate) : 0);
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
825 if (video_codec)
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
826 video_codecs = g_list_append(
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
827 video_codecs, codec);
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
828 else
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
829 codecs = g_list_append(codecs, codec);
26981
93f90b138e5f Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents: 26782
diff changeset
830 }
26205
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
831 }
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
832
27202
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
833 if (codecs)
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
834 purple_media_set_remote_codecs(session->media, "google-voice",
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
835 session->remote_jid, codecs);
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
836 if (video_codecs)
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
837 purple_media_set_remote_codecs(session->media, "google-video",
5244a5510e0e Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents: 27169
diff changeset
838 session->remote_jid, video_codecs);
26205
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
839
26501
c186275f46aa Remove purple_media_accept.
Michael Ruprecht <maiku@pidgin.im>
parents: 26499
diff changeset
840 purple_media_stream_info(session->media, PURPLE_MEDIA_INFO_ACCEPT,
c186275f46aa Remove purple_media_accept.
Michael Ruprecht <maiku@pidgin.im>
parents: 26499
diff changeset
841 NULL, NULL, FALSE);
26484
131c5b5bcf61 Fix Gtalk bug where it would terminate the session after 15 seconds.
Michael Ruprecht <maiku@pidgin.im>
parents: 26454
diff changeset
842
131c5b5bcf61 Fix Gtalk bug where it would terminate the session after 15 seconds.
Michael Ruprecht <maiku@pidgin.im>
parents: 26454
diff changeset
843 result = jabber_iq_new(js, JABBER_IQ_RESULT);
26698
417e1c82963b And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents: 26693
diff changeset
844 jabber_iq_set_id(result, iq_id);
26484
131c5b5bcf61 Fix Gtalk bug where it would terminate the session after 15 seconds.
Michael Ruprecht <maiku@pidgin.im>
parents: 26454
diff changeset
845 xmlnode_set_attrib(result->node, "to", session->remote_jid);
131c5b5bcf61 Fix Gtalk bug where it would terminate the session after 15 seconds.
Michael Ruprecht <maiku@pidgin.im>
parents: 26454
diff changeset
846 jabber_iq_send(result);
26205
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
847 }
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
848
f20bb7e9e311 Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents: 26201
diff changeset
849 static void
26698
417e1c82963b And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents: 26693
diff changeset
850 google_session_handle_reject(JabberStream *js, GoogleSession *session, xmlnode *sess)
19885
593613a22e57 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents: 19882
diff changeset
851 {
26264
c062fc1f212f Added purple_media_end and removed the purple_media_got_hangup.
Michael Ruprecht <maiku@pidgin.im>
parents: 26248
diff changeset
852 purple_media_end(session->media, NULL, NULL);
19885
593613a22e57 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents: 19882
diff changeset
853 }
593613a22e57 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents: 19882
diff changeset
854
593613a22e57 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents: 19882
diff changeset
855 static void
26698
417e1c82963b And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents: 26693
diff changeset
856 google_session_handle_terminate(JabberStream *js, GoogleSession *session, xmlnode *sess)
19885
593613a22e57 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents: 19882
diff changeset
857 {
26264
c062fc1f212f Added purple_media_end and removed the purple_media_got_hangup.
Michael Ruprecht <maiku@pidgin.im>
parents: 26248
diff changeset
858 purple_media_end(session->media, NULL, NULL);
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
859 }
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
860
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
861 static void
26698
417e1c82963b And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents: 26693
diff changeset
862 google_session_parse_iq(JabberStream *js, GoogleSession *session, xmlnode *sess, const char *iq_id)
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
863 {
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
864 const char *type = xmlnode_get_attrib(sess, "type");
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
865
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
866 if (!strcmp(type, "initiate")) {
26698
417e1c82963b And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents: 26693
diff changeset
867 google_session_handle_initiate(js, session, sess, iq_id);
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
868 } else if (!strcmp(type, "accept")) {
26698
417e1c82963b And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents: 26693
diff changeset
869 google_session_handle_accept(js, session, sess, iq_id);
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
870 } else if (!strcmp(type, "reject")) {
26698
417e1c82963b And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents: 26693
diff changeset
871 google_session_handle_reject(js, session, sess);
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
872 } else if (!strcmp(type, "terminate")) {
26698
417e1c82963b And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents: 26693
diff changeset
873 google_session_handle_terminate(js, session, sess);
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
874 } else if (!strcmp(type, "candidates")) {
26698
417e1c82963b And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents: 26693
diff changeset
875 google_session_handle_candidates(js, session, sess, iq_id);
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
876 }
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
877 }
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
878
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
879 void
26698
417e1c82963b And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents: 26693
diff changeset
880 jabber_google_session_parse(JabberStream *js, const char *from,
417e1c82963b And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents: 26693
diff changeset
881 JabberIqType type, const char *iq_id,
417e1c82963b And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents: 26693
diff changeset
882 xmlnode *session_node)
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
883 {
26331
d5ebef68c29d Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents: 26286
diff changeset
884 GoogleSession *session = NULL;
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
885 GoogleSessionId id;
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
886
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
887 xmlnode *desc_node;
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
888
26331
d5ebef68c29d Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents: 26286
diff changeset
889 GList *iter = NULL;
d5ebef68c29d Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents: 26286
diff changeset
890
26698
417e1c82963b And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents: 26693
diff changeset
891 if (type != JABBER_IQ_SET)
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
892 return;
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
893
23697
299bafcd8eb8 Updates voice and video to use Farsight 2, gets XMPP voice conferences
Michael Ruprecht <maiku@pidgin.im>
parents: 22648
diff changeset
894 id.id = (gchar*)xmlnode_get_attrib(session_node, "id");
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
895 if (!id.id)
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
896 return;
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
897
23697
299bafcd8eb8 Updates voice and video to use Farsight 2, gets XMPP voice conferences
Michael Ruprecht <maiku@pidgin.im>
parents: 22648
diff changeset
898 id.initiator = (gchar*)xmlnode_get_attrib(session_node, "initiator");
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
899 if (!id.initiator)
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
900 return;
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
901
26746
2a2d45ac9774 Switch media to store accounts rather than connections.
Michael Ruprecht <maiku@pidgin.im>
parents: 26698
diff changeset
902 iter = purple_media_manager_get_media_by_account(
2a2d45ac9774 Switch media to store accounts rather than connections.
Michael Ruprecht <maiku@pidgin.im>
parents: 26698
diff changeset
903 purple_media_manager_get(),
2a2d45ac9774 Switch media to store accounts rather than connections.
Michael Ruprecht <maiku@pidgin.im>
parents: 26698
diff changeset
904 purple_connection_get_account(js->gc));
26331
d5ebef68c29d Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents: 26286
diff changeset
905 for (; iter; iter = g_list_delete_link(iter, iter)) {
d5ebef68c29d Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents: 26286
diff changeset
906 GoogleSession *gsession =
d5ebef68c29d Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents: 26286
diff changeset
907 purple_media_get_prpl_data(iter->data);
d5ebef68c29d Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents: 26286
diff changeset
908 if (google_session_id_equal(&(gsession->id), &id)) {
d5ebef68c29d Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents: 26286
diff changeset
909 session = gsession;
d5ebef68c29d Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents: 26286
diff changeset
910 break;
d5ebef68c29d Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents: 26286
diff changeset
911 }
d5ebef68c29d Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents: 26286
diff changeset
912 }
d5ebef68c29d Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents: 26286
diff changeset
913 if (iter != NULL) {
d5ebef68c29d Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents: 26286
diff changeset
914 g_list_free(iter);
d5ebef68c29d Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents: 26286
diff changeset
915 }
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
916
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
917 if (session) {
26698
417e1c82963b And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents: 26693
diff changeset
918 google_session_parse_iq(js, session, session_node, iq_id);
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
919 return;
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
920 }
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
921
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
922 /* If the session doesn't exist, this has to be an initiate message */
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
923 if (strcmp(xmlnode_get_attrib(session_node, "type"), "initiate"))
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
924 return;
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
925 desc_node = xmlnode_get_child(session_node, "description");
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
926 if (!desc_node)
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
927 return;
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
928 session = g_new0(GoogleSession, 1);
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
929 session->id.id = g_strdup(id.id);
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
930 session->id.initiator = g_strdup(id.initiator);
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
931 session->state = UNINIT;
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
932 session->js = js;
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
933 session->remote_jid = g_strdup(session->id.initiator);
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
934
28329
0300f09b9cd6 Gracefully handle failures to create an FsStream. This was caused by
Michael Ruprecht <maiku@pidgin.im>
parents: 28318
diff changeset
935 google_session_handle_initiate(js, session, session_node, iq_id);
26454
94130b583e0b Clean up usage of USE_VV in the XMPP protocol.
Michael Ruprecht <maiku@pidgin.im>
parents: 26449
diff changeset
936 }
23704
9b88c9b23aed Use USE_VV instead of USE_FARSIGHT.
Michael Ruprecht <maiku@pidgin.im>
parents: 23700
diff changeset
937 #endif /* USE_VV */
19882
d8c2a2fc1fbf Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents: 19046
diff changeset
938
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
939 static void
26687
1e799151fabe Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <darkrain42@pidgin.im>
parents: 26088
diff changeset
940 jabber_gmail_parse(JabberStream *js, const char *from,
1e799151fabe Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <darkrain42@pidgin.im>
parents: 26088
diff changeset
941 JabberIqType type, const char *id,
1e799151fabe Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <darkrain42@pidgin.im>
parents: 26088
diff changeset
942 xmlnode *packet, gpointer nul)
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
943 {
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
944 xmlnode *child;
26687
1e799151fabe Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <darkrain42@pidgin.im>
parents: 26088
diff changeset
945 xmlnode *message;
27570
e54277ae75cb disapproval of revision '0eb69320deac850f1a1eb6ff8ea6c64103095ee8'
Paul Aurich <darkrain42@pidgin.im>
parents: 27506
diff changeset
946 const char *to, *url;
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
947 const char *in_str;
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
948 char *to_name;
20097
f5bef80db09e applied changes from 19e3744fd4b392cdc631c9efe0ce658537070713
Richard Laager <rlaager@pidgin.im>
parents: 19859
diff changeset
949
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
950 int i, count = 1, returned_count;
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
951
18739
3cd45d53cf26 Various leak fixes.
Daniel Atallah <datallah@pidgin.im>
parents: 18233
diff changeset
952 const char **tos, **froms, **urls;
3cd45d53cf26 Various leak fixes.
Daniel Atallah <datallah@pidgin.im>
parents: 18233
diff changeset
953 char **subjects;
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
954
26687
1e799151fabe Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <darkrain42@pidgin.im>
parents: 26088
diff changeset
955 if (type == JABBER_IQ_ERROR)
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
956 return;
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
957
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
958 child = xmlnode_get_child(packet, "mailbox");
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
959 if (!child)
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
960 return;
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
961
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
962 in_str = xmlnode_get_attrib(child, "total-matched");
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
963 if (in_str && *in_str)
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
964 count = atoi(in_str);
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
965
20097
f5bef80db09e applied changes from 19e3744fd4b392cdc631c9efe0ce658537070713
Richard Laager <rlaager@pidgin.im>
parents: 19859
diff changeset
966 /* If Gmail doesn't tell us who the mail is to, let's use our JID */
f5bef80db09e applied changes from 19e3744fd4b392cdc631c9efe0ce658537070713
Richard Laager <rlaager@pidgin.im>
parents: 19859
diff changeset
967 to = xmlnode_get_attrib(packet, "to");
f5bef80db09e applied changes from 19e3744fd4b392cdc631c9efe0ce658537070713
Richard Laager <rlaager@pidgin.im>
parents: 19859
diff changeset
968
20114
96e715e155e0 applied changes from 3fcc47961d378fa0cd4eeb00dc6923b16a3a4151
Richard Laager <rlaager@pidgin.im>
parents: 20107
diff changeset
969 message = xmlnode_get_child(child, "mail-thread-info");
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
970
20114
96e715e155e0 applied changes from 3fcc47961d378fa0cd4eeb00dc6923b16a3a4151
Richard Laager <rlaager@pidgin.im>
parents: 20107
diff changeset
971 if (count == 0 || !message) {
25746
e97bb5964b19 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents: 23540
diff changeset
972 if (count > 0) {
e97bb5964b19 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents: 23540
diff changeset
973 char *bare_jid = jabber_get_bare_jid(to);
e97bb5964b19 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents: 23540
diff changeset
974 const char *default_tos[2] = { bare_jid };
e97bb5964b19 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents: 23540
diff changeset
975
e97bb5964b19 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents: 23540
diff changeset
976 purple_notify_emails(js->gc, count, FALSE, NULL, NULL, default_tos, NULL, NULL, NULL);
e97bb5964b19 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents: 23540
diff changeset
977 g_free(bare_jid);
e97bb5964b19 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents: 23540
diff changeset
978 } else {
e97bb5964b19 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents: 23540
diff changeset
979 purple_notify_emails(js->gc, count, FALSE, NULL, NULL, NULL, NULL, NULL, NULL);
e97bb5964b19 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents: 23540
diff changeset
980 }
e97bb5964b19 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents: 23540
diff changeset
981
20097
f5bef80db09e applied changes from 19e3744fd4b392cdc631c9efe0ce658537070713
Richard Laager <rlaager@pidgin.im>
parents: 19859
diff changeset
982 return;
f5bef80db09e applied changes from 19e3744fd4b392cdc631c9efe0ce658537070713
Richard Laager <rlaager@pidgin.im>
parents: 19859
diff changeset
983 }
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
984
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
985 /* Loop once to see how many messages were returned so we can allocate arrays
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
986 * accordingly */
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
987 for (returned_count = 0; message; returned_count++, message=xmlnode_get_next_twin(message));
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
988
25746
e97bb5964b19 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents: 23540
diff changeset
989 froms = g_new0(const char* , returned_count + 1);
e97bb5964b19 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents: 23540
diff changeset
990 tos = g_new0(const char* , returned_count + 1);
e97bb5964b19 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents: 23540
diff changeset
991 subjects = g_new0(char* , returned_count + 1);
e97bb5964b19 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents: 23540
diff changeset
992 urls = g_new0(const char* , returned_count + 1);
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
993
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
994 to = xmlnode_get_attrib(packet, "to");
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
995 to_name = jabber_get_bare_jid(to);
27570
e54277ae75cb disapproval of revision '0eb69320deac850f1a1eb6ff8ea6c64103095ee8'
Paul Aurich <darkrain42@pidgin.im>
parents: 27506
diff changeset
996 url = xmlnode_get_attrib(child, "url");
e54277ae75cb disapproval of revision '0eb69320deac850f1a1eb6ff8ea6c64103095ee8'
Paul Aurich <darkrain42@pidgin.im>
parents: 27506
diff changeset
997 if (!url || !*url)
e54277ae75cb disapproval of revision '0eb69320deac850f1a1eb6ff8ea6c64103095ee8'
Paul Aurich <darkrain42@pidgin.im>
parents: 27506
diff changeset
998 url = "http://www.gmail.com";
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
999
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1000 message= xmlnode_get_child(child, "mail-thread-info");
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1001 for (i=0; message; message = xmlnode_get_next_twin(message), i++) {
26687
1e799151fabe Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <darkrain42@pidgin.im>
parents: 26088
diff changeset
1002 xmlnode *sender_node, *subject_node;
27570
e54277ae75cb disapproval of revision '0eb69320deac850f1a1eb6ff8ea6c64103095ee8'
Paul Aurich <darkrain42@pidgin.im>
parents: 27506
diff changeset
1003 const char *from, *tid;
26687
1e799151fabe Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <darkrain42@pidgin.im>
parents: 26088
diff changeset
1004 char *subject;
1e799151fabe Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <darkrain42@pidgin.im>
parents: 26088
diff changeset
1005
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1006 subject_node = xmlnode_get_child(message, "subject");
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1007 sender_node = xmlnode_get_child(message, "senders");
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1008 sender_node = xmlnode_get_child(sender_node, "sender");
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1009
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1010 while (sender_node && (!xmlnode_get_attrib(sender_node, "unread") ||
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1011 !strcmp(xmlnode_get_attrib(sender_node, "unread"),"0")))
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1012 sender_node = xmlnode_get_next_twin(sender_node);
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1013
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1014 if (!sender_node) {
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1015 i--;
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1016 continue;
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1017 }
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1018
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1019 from = xmlnode_get_attrib(sender_node, "name");
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1020 if (!from || !*from)
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1021 from = xmlnode_get_attrib(sender_node, "address");
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1022 subject = xmlnode_get_data(subject_node);
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1023 /*
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1024 * url = xmlnode_get_attrib(message, "url");
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1025 */
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1026 tos[i] = (to_name != NULL ? to_name : "");
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1027 froms[i] = (from != NULL ? from : "");
18739
3cd45d53cf26 Various leak fixes.
Daniel Atallah <datallah@pidgin.im>
parents: 18233
diff changeset
1028 subjects[i] = (subject != NULL ? subject : g_strdup(""));
20225
684334efdc19 applied changes from d4b316d73ebaf93803ca2642e78b8821c3b5d5c7
Luke Schierer <lschiere@pidgin.im>
parents: 20209
diff changeset
1029 urls[i] = url;
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1030
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1031 tid = xmlnode_get_attrib(message, "tid");
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1032 if (tid &&
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1033 (js->gmail_last_tid == NULL || strcmp(tid, js->gmail_last_tid) > 0)) {
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1034 g_free(js->gmail_last_tid);
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1035 js->gmail_last_tid = g_strdup(tid);
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1036 }
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1037 }
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1038
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1039 if (i>0)
18740
1b1f72624316 Only display the "detailed" email notifications for gtalk if we really have all the details to show. Fixes #1813.
Daniel Atallah <datallah@pidgin.im>
parents: 18739
diff changeset
1040 purple_notify_emails(js->gc, count, count == i, (const char**) subjects, froms, tos,
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1041 urls, NULL, NULL);
15261
109ac4fcc3e7 [gaim-migrate @ 17989]
Sean Egan <seanegan@pidgin.im>
parents: 15225
diff changeset
1042
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1043 g_free(to_name);
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1044 g_free(tos);
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1045 g_free(froms);
25746
e97bb5964b19 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents: 23540
diff changeset
1046 for (i = 0; i < returned_count; i++)
e97bb5964b19 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents: 23540
diff changeset
1047 g_free(subjects[i]);
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1048 g_free(subjects);
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1049 g_free(urls);
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1050
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1051 in_str = xmlnode_get_attrib(child, "result-time");
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1052 if (in_str && *in_str) {
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1053 g_free(js->gmail_last_time);
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1054 js->gmail_last_time = g_strdup(in_str);
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1055 }
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1056 }
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1057
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1058 void
25817
09d6a40a341d Pass IQ handlers type, from, id, and the child node
Paul Aurich <darkrain42@pidgin.im>
parents: 25566
diff changeset
1059 jabber_gmail_poke(JabberStream *js, const char *from, JabberIqType type,
09d6a40a341d Pass IQ handlers type, from, id, and the child node
Paul Aurich <darkrain42@pidgin.im>
parents: 25566
diff changeset
1060 const char *id, xmlnode *new_mail)
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1061 {
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1062 xmlnode *query;
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1063 JabberIq *iq;
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1064
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1065 /* bail if the user isn't interested */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15587
diff changeset
1066 if (!purple_account_get_check_mail(js->gc->account))
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1067 return;
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1068
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1069 /* Is this an initial incoming mail notification? If so, send a request for more info */
25817
09d6a40a341d Pass IQ handlers type, from, id, and the child node
Paul Aurich <darkrain42@pidgin.im>
parents: 25566
diff changeset
1070 if (type != JABBER_IQ_SET)
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1071 return;
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1072
27062
84edb52aea5b Ack the mail notification IQ. Refs #8240.
Paul Aurich <darkrain42@pidgin.im>
parents: 26981
diff changeset
1073 /* Acknowledge the notification */
84edb52aea5b Ack the mail notification IQ. Refs #8240.
Paul Aurich <darkrain42@pidgin.im>
parents: 26981
diff changeset
1074 iq = jabber_iq_new(js, JABBER_IQ_RESULT);
27081
51d62a0b66f9 Avoid an assertion when acking the gmail poke
Paul Aurich <darkrain42@pidgin.im>
parents: 27062
diff changeset
1075 if (from)
51d62a0b66f9 Avoid an assertion when acking the gmail poke
Paul Aurich <darkrain42@pidgin.im>
parents: 27062
diff changeset
1076 xmlnode_set_attrib(iq->node, "to", from);
27062
84edb52aea5b Ack the mail notification IQ. Refs #8240.
Paul Aurich <darkrain42@pidgin.im>
parents: 26981
diff changeset
1077 xmlnode_set_attrib(iq->node, "id", id);
84edb52aea5b Ack the mail notification IQ. Refs #8240.
Paul Aurich <darkrain42@pidgin.im>
parents: 26981
diff changeset
1078 jabber_iq_send(iq);
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1079
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15587
diff changeset
1080 purple_debug(PURPLE_DEBUG_MISC, "jabber",
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1081 "Got new mail notification. Sending request for more info\n");
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1082
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1083 iq = jabber_iq_new_query(js, JABBER_IQ_GET, "google:mail:notify");
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1084 jabber_iq_set_callback(iq, jabber_gmail_parse, NULL);
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1085 query = xmlnode_get_child(iq->node, "query");
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1086
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1087 if (js->gmail_last_time)
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1088 xmlnode_set_attrib(query, "newer-than-time", js->gmail_last_time);
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1089 if (js->gmail_last_tid)
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1090 xmlnode_set_attrib(query, "newer-than-tid", js->gmail_last_tid);
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1091
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1092 jabber_iq_send(iq);
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1093 return;
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1094 }
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1095
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1096 void jabber_gmail_init(JabberStream *js) {
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1097 JabberIq *iq;
27486
f075cba58507 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <darkrain42@pidgin.im>
parents: 27361
diff changeset
1098 xmlnode *usersetting, *mailnotifications;
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1099
27486
f075cba58507 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <darkrain42@pidgin.im>
parents: 27361
diff changeset
1100 if (!purple_account_get_check_mail(purple_connection_get_account(js->gc)))
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1101 return;
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1102
27486
f075cba58507 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <darkrain42@pidgin.im>
parents: 27361
diff changeset
1103 /*
f075cba58507 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <darkrain42@pidgin.im>
parents: 27361
diff changeset
1104 * Quoting http://code.google.com/apis/talk/jep_extensions/usersettings.html:
f075cba58507 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <darkrain42@pidgin.im>
parents: 27361
diff changeset
1105 * To ensure better compatibility with other clients, rather than
f075cba58507 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <darkrain42@pidgin.im>
parents: 27361
diff changeset
1106 * setting this value to "false" to turn off notifications, it is
f075cba58507 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <darkrain42@pidgin.im>
parents: 27361
diff changeset
1107 * recommended that a client set this to "true" and filter incoming
f075cba58507 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <darkrain42@pidgin.im>
parents: 27361
diff changeset
1108 * email notifications itself.
f075cba58507 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <darkrain42@pidgin.im>
parents: 27361
diff changeset
1109 */
f075cba58507 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <darkrain42@pidgin.im>
parents: 27361
diff changeset
1110 iq = jabber_iq_new(js, JABBER_IQ_SET);
f075cba58507 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <darkrain42@pidgin.im>
parents: 27361
diff changeset
1111 usersetting = xmlnode_new_child(iq->node, "usersetting");
f075cba58507 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <darkrain42@pidgin.im>
parents: 27361
diff changeset
1112 xmlnode_set_namespace(usersetting, "google:setting");
f075cba58507 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <darkrain42@pidgin.im>
parents: 27361
diff changeset
1113 mailnotifications = xmlnode_new_child(usersetting, "mailnotifications");
f075cba58507 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <darkrain42@pidgin.im>
parents: 27361
diff changeset
1114 xmlnode_set_attrib(mailnotifications, "value", "true");
f075cba58507 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <darkrain42@pidgin.im>
parents: 27361
diff changeset
1115 jabber_iq_send(iq);
f075cba58507 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <darkrain42@pidgin.im>
parents: 27361
diff changeset
1116
15225
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1117 iq = jabber_iq_new_query(js, JABBER_IQ_GET, "google:mail:notify");
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1118 jabber_iq_set_callback(iq, jabber_gmail_parse, NULL);
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1119 jabber_iq_send(iq);
d04a059065dd [gaim-migrate @ 17949]
Sean Egan <seanegan@pidgin.im>
parents:
diff changeset
1120 }
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1121
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1122 void jabber_google_roster_init(JabberStream *js)
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1123 {
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1124 JabberIq *iq;
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1125 xmlnode *query;
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1126
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1127 iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:roster");
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1128 query = xmlnode_get_child(iq->node, "query");
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1129
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1130 xmlnode_set_attrib(query, "xmlns:gr", "google:roster");
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1131 xmlnode_set_attrib(query, "gr:ext", "2");
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1132
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1133 jabber_iq_send(iq);
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1134 }
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1135
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1136 void jabber_google_roster_outgoing(JabberStream *js, xmlnode *query, xmlnode *item)
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1137 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15587
diff changeset
1138 PurpleAccount *account = purple_connection_get_account(js->gc);
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1139 GSList *list = account->deny;
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1140 const char *jid = xmlnode_get_attrib(item, "jid");
27950
5482259bd140 --warnings;
Paul Aurich <darkrain42@pidgin.im>
parents: 27937
diff changeset
1141 char *jid_norm = (char *)jabber_normalize(account, jid);
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1142
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1143 while (list) {
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1144 if (!strcmp(jid_norm, (char*)list->data)) {
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1145 xmlnode_set_attrib(query, "xmlns:gr", "google:roster");
27937
8b3b0d69f8d6 Fix a small leak and remove a duplicate xmlnode_set_attrib.
Paul Aurich <darkrain42@pidgin.im>
parents: 27779
diff changeset
1146 xmlnode_set_attrib(query, "gr:ext", "2");
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1147 xmlnode_set_attrib(item, "gr:t", "B");
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1148 return;
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1149 }
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1150 list = list->next;
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1151 }
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1152 }
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1153
15530
9355a1be068e Make deleting Google Talk buddies work
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1154 gboolean jabber_google_roster_incoming(JabberStream *js, xmlnode *item)
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1155 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15587
diff changeset
1156 PurpleAccount *account = purple_connection_get_account(js->gc);
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1157 const char *jid = xmlnode_get_attrib(item, "jid");
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1158 gboolean on_block_list = FALSE;
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1159
20209
c1bbdde1f373 applied changes from 6b5f1f48667171fe73de619dd8f80cacd231a2e2
Luke Schierer <lschiere@pidgin.im>
parents: 20186
diff changeset
1160 char *jid_norm;
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1161
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1162 const char *grt = xmlnode_get_attrib_with_namespace(item, "t", "google:roster");
17148
db0801f13aa8 If Google Talk tells you a roster item as a none subscription, we probably don't ever want to show it. Fixes #1189
Sean Egan <seanegan@pidgin.im>
parents: 16988
diff changeset
1163 const char *subscription = xmlnode_get_attrib(item, "subscription");
28757
055c0bc2a3dd jabber: Don't ignore Google buddies with subscription="none", but ask="subscribe".
Paul Aurich <darkrain42@pidgin.im>
parents: 28669
diff changeset
1164 const char *ask = xmlnode_get_attrib(item, "ask");
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1165
28757
055c0bc2a3dd jabber: Don't ignore Google buddies with subscription="none", but ask="subscribe".
Paul Aurich <darkrain42@pidgin.im>
parents: 28669
diff changeset
1166 if ((!subscription || !strcmp(subscription, "none")) && !ask) {
17148
db0801f13aa8 If Google Talk tells you a roster item as a none subscription, we probably don't ever want to show it. Fixes #1189
Sean Egan <seanegan@pidgin.im>
parents: 16988
diff changeset
1167 /* The Google Talk servers will automatically add people from your Gmail address book
db0801f13aa8 If Google Talk tells you a roster item as a none subscription, we probably don't ever want to show it. Fixes #1189
Sean Egan <seanegan@pidgin.im>
parents: 16988
diff changeset
1168 * with subscription=none. If we see someone with subscription=none, ignore them.
db0801f13aa8 If Google Talk tells you a roster item as a none subscription, we probably don't ever want to show it. Fixes #1189
Sean Egan <seanegan@pidgin.im>
parents: 16988
diff changeset
1169 */
db0801f13aa8 If Google Talk tells you a roster item as a none subscription, we probably don't ever want to show it. Fixes #1189
Sean Egan <seanegan@pidgin.im>
parents: 16988
diff changeset
1170 return FALSE;
db0801f13aa8 If Google Talk tells you a roster item as a none subscription, we probably don't ever want to show it. Fixes #1189
Sean Egan <seanegan@pidgin.im>
parents: 16988
diff changeset
1171 }
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1172
20209
c1bbdde1f373 applied changes from 6b5f1f48667171fe73de619dd8f80cacd231a2e2
Luke Schierer <lschiere@pidgin.im>
parents: 20186
diff changeset
1173 jid_norm = g_strdup(jabber_normalize(account, jid));
c1bbdde1f373 applied changes from 6b5f1f48667171fe73de619dd8f80cacd231a2e2
Luke Schierer <lschiere@pidgin.im>
parents: 20186
diff changeset
1174
27277
8a2ecbdd70e4 Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents: 27203
diff changeset
1175 on_block_list = NULL != g_slist_find_custom(account->deny, jid_norm,
8a2ecbdd70e4 Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents: 27203
diff changeset
1176 (GCompareFunc)strcmp);
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1177
15530
9355a1be068e Make deleting Google Talk buddies work
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1178 if (grt && (*grt == 'H' || *grt == 'h')) {
27277
8a2ecbdd70e4 Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents: 27203
diff changeset
1179 /* Hidden; don't show this buddy. */
8a2ecbdd70e4 Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents: 27203
diff changeset
1180 GSList *buddies = purple_find_buddies(account, jid_norm);
8a2ecbdd70e4 Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents: 27203
diff changeset
1181 if (buddies)
8a2ecbdd70e4 Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents: 27203
diff changeset
1182 purple_debug_info("jabber", "Removing %s from local buddy list\n",
8a2ecbdd70e4 Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents: 27203
diff changeset
1183 jid_norm);
8a2ecbdd70e4 Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents: 27203
diff changeset
1184
8a2ecbdd70e4 Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents: 27203
diff changeset
1185 for ( ; buddies; buddies = g_slist_delete_link(buddies, buddies)) {
8a2ecbdd70e4 Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents: 27203
diff changeset
1186 purple_blist_remove_buddy(buddies->data);
8a2ecbdd70e4 Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents: 27203
diff changeset
1187 }
8a2ecbdd70e4 Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents: 27203
diff changeset
1188
18739
3cd45d53cf26 Various leak fixes.
Daniel Atallah <datallah@pidgin.im>
parents: 18233
diff changeset
1189 g_free(jid_norm);
15530
9355a1be068e Make deleting Google Talk buddies work
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1190 return FALSE;
9355a1be068e Make deleting Google Talk buddies work
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1191 }
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1192
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1193 if (!on_block_list && (grt && (*grt == 'B' || *grt == 'b'))) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15587
diff changeset
1194 purple_debug_info("jabber", "Blocking %s\n", jid_norm);
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15587
diff changeset
1195 purple_privacy_deny_add(account, jid_norm, TRUE);
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1196 } else if (on_block_list && (!grt || (*grt != 'B' && *grt != 'b' ))){
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15587
diff changeset
1197 purple_debug_info("jabber", "Unblocking %s\n", jid_norm);
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15587
diff changeset
1198 purple_privacy_deny_remove(account, jid_norm, TRUE);
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1199 }
18739
3cd45d53cf26 Various leak fixes.
Daniel Atallah <datallah@pidgin.im>
parents: 18233
diff changeset
1200
3cd45d53cf26 Various leak fixes.
Daniel Atallah <datallah@pidgin.im>
parents: 18233
diff changeset
1201 g_free(jid_norm);
15530
9355a1be068e Make deleting Google Talk buddies work
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1202 return TRUE;
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1203 }
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1204
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1205 void jabber_google_roster_add_deny(PurpleConnection *gc, const char *who)
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1206 {
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1207 JabberStream *js;
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1208 GSList *buddies;
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1209 JabberIq *iq;
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1210 xmlnode *query;
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1211 xmlnode *item;
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1212 xmlnode *group;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15587
diff changeset
1213 PurpleBuddy *b;
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1214 JabberBuddy *jb;
24950
143f594f0cd0 Alias foo. I think blist.h structs are now completely hidden.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 24944
diff changeset
1215 const char *balias;
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1216
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1217 js = (JabberStream*)(gc->proto_data);
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1218
27701
d60dcfcb5bfe keep the compiler happy:
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 27679
diff changeset
1219 if (!js || !(js->server_caps & JABBER_CAP_GOOGLE_ROSTER))
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1220 return;
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1221
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1222 jb = jabber_buddy_find(js, who, TRUE);
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1223
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15587
diff changeset
1224 buddies = purple_find_buddies(js->gc->account, who);
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1225 if(!buddies)
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1226 return;
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1227
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1228 b = buddies->data;
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1229
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1230 iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:roster");
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1231
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1232 query = xmlnode_get_child(iq->node, "query");
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1233 item = xmlnode_new_child(query, "item");
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1234
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1235 while(buddies) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15587
diff changeset
1236 PurpleGroup *g;
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1237
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1238 b = buddies->data;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15587
diff changeset
1239 g = purple_buddy_get_group(b);
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1240
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1241 group = xmlnode_new_child(item, "group");
24398
4865c2ee6ea8 Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23540
diff changeset
1242 xmlnode_insert_data(group, purple_group_get_name(g), -1);
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1243
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1244 buddies = buddies->next;
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1245 }
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1246
24950
143f594f0cd0 Alias foo. I think blist.h structs are now completely hidden.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 24944
diff changeset
1247 balias = purple_buddy_get_local_buddy_alias(b);
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1248 xmlnode_set_attrib(item, "jid", who);
24950
143f594f0cd0 Alias foo. I think blist.h structs are now completely hidden.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 24944
diff changeset
1249 xmlnode_set_attrib(item, "name", balias ? balias : "");
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1250 xmlnode_set_attrib(item, "gr:t", "B");
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1251 xmlnode_set_attrib(query, "xmlns:gr", "google:roster");
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1252 xmlnode_set_attrib(query, "gr:ext", "2");
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1253
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1254 jabber_iq_send(iq);
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1255
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1256 /* Synthesize a sign-off */
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1257 if (jb) {
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1258 JabberBuddyResource *jbr;
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1259 GList *l = jb->resources;
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1260 while (l) {
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1261 jbr = l->data;
15346
ef48613b5b9b [gaim-migrate @ 18074]
Evan Schoenberg <evands@pidgin.im>
parents: 15265
diff changeset
1262 if (jbr && jbr->name)
ef48613b5b9b [gaim-migrate @ 18074]
Evan Schoenberg <evands@pidgin.im>
parents: 15265
diff changeset
1263 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15587
diff changeset
1264 purple_debug(PURPLE_DEBUG_MISC, "jabber", "Removing resource %s\n", jbr->name);
15346
ef48613b5b9b [gaim-migrate @ 18074]
Evan Schoenberg <evands@pidgin.im>
parents: 15265
diff changeset
1265 jabber_buddy_remove_resource(jb, jbr->name);
ef48613b5b9b [gaim-migrate @ 18074]
Evan Schoenberg <evands@pidgin.im>
parents: 15265
diff changeset
1266 }
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1267 l = l->next;
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1268 }
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1269 }
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15587
diff changeset
1270 purple_prpl_got_user_status(purple_connection_get_account(gc), who, "offline", NULL);
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1271 }
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1272
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15587
diff changeset
1273 void jabber_google_roster_rem_deny(PurpleConnection *gc, const char *who)
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1274 {
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1275 JabberStream *js;
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1276 GSList *buddies;
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1277 JabberIq *iq;
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1278 xmlnode *query;
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1279 xmlnode *item;
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1280 xmlnode *group;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15587
diff changeset
1281 PurpleBuddy *b;
24950
143f594f0cd0 Alias foo. I think blist.h structs are now completely hidden.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 24944
diff changeset
1282 const char *balias;
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1283
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1284 g_return_if_fail(gc != NULL);
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1285 g_return_if_fail(who != NULL);
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1286
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1287 js = (JabberStream*)(gc->proto_data);
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1288
27701
d60dcfcb5bfe keep the compiler happy:
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 27679
diff changeset
1289 if (!js || !(js->server_caps & JABBER_CAP_GOOGLE_ROSTER))
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1290 return;
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1291
24942
ec72b773a9da More struct hiding work
Richard Laager <rlaager@pidgin.im>
parents: 23540
diff changeset
1292 buddies = purple_find_buddies(purple_connection_get_account(js->gc), who);
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1293 if(!buddies)
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1294 return;
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1295
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1296 b = buddies->data;
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1297
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1298 iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:roster");
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1299
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1300 query = xmlnode_get_child(iq->node, "query");
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1301 item = xmlnode_new_child(query, "item");
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1302
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1303 while(buddies) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15587
diff changeset
1304 PurpleGroup *g;
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1305
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1306 b = buddies->data;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15587
diff changeset
1307 g = purple_buddy_get_group(b);
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1308
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1309 group = xmlnode_new_child(item, "group");
24398
4865c2ee6ea8 Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23540
diff changeset
1310 xmlnode_insert_data(group, purple_group_get_name(g), -1);
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1311
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1312 buddies = buddies->next;
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1313 }
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1314
24950
143f594f0cd0 Alias foo. I think blist.h structs are now completely hidden.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 24944
diff changeset
1315 balias = purple_buddy_get_local_buddy_alias(b);
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1316 xmlnode_set_attrib(item, "jid", who);
24950
143f594f0cd0 Alias foo. I think blist.h structs are now completely hidden.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 24944
diff changeset
1317 xmlnode_set_attrib(item, "name", balias ? balias : "");
15265
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1318 xmlnode_set_attrib(query, "xmlns:gr", "google:roster");
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1319 xmlnode_set_attrib(query, "gr:ext", "2");
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1320
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1321 jabber_iq_send(iq);
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1322
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1323 /* See if he's online */
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1324 jabber_presence_subscription_set(js, who, "probe");
a5b0ab58b05d [gaim-migrate @ 17993]
Sean Egan <seanegan@pidgin.im>
parents: 15261
diff changeset
1325 }
15587
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1326
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1327 /* This does two passes on the string. The first pass goes through
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1328 * and determine if all the structured text is properly balanced, and
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1329 * how many instances of each there is. The second pass goes and converts
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1330 * everything to HTML, depending on what's figured out by the first pass.
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1331 * It will short circuit once it knows it has no more replacements to make
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1332 */
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1333 char *jabber_google_format_to_html(const char *text)
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1334 {
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1335 const char *p;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1336
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1337 /* The start of the screen may be consdiered a space for this purpose */
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1338 gboolean preceding_space = TRUE;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1339
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1340 gboolean in_bold = FALSE, in_italic = FALSE;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1341 gboolean in_tag = FALSE;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1342
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1343 gint bold_count = 0, italic_count = 0;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1344
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1345 GString *str;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1346
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1347 for (p = text; *p != '\0'; p = g_utf8_next_char(p)) {
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1348 gunichar c = g_utf8_get_char(p);
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1349 if (c == '*' && !in_tag) {
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1350 if (in_bold && (g_unichar_isspace(*(p+1)) ||
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1351 *(p+1) == '\0' ||
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1352 *(p+1) == '<')) {
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1353 bold_count++;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1354 in_bold = FALSE;
16988
1aaf51bf0f23 Patch #265. Fix to Google Talk formatting
Sean Egan <seanegan@pidgin.im>
parents: 15884
diff changeset
1355 } else if (preceding_space && !in_bold && !g_unichar_isspace(*(p+1))) {
15587
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1356 bold_count++;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1357 in_bold = TRUE;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1358 }
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1359 preceding_space = TRUE;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1360 } else if (c == '_' && !in_tag) {
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1361 if (in_italic && (g_unichar_isspace(*(p+1)) ||
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1362 *(p+1) == '\0' ||
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1363 *(p+1) == '<')) {
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1364 italic_count++;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1365 in_italic = FALSE;
16988
1aaf51bf0f23 Patch #265. Fix to Google Talk formatting
Sean Egan <seanegan@pidgin.im>
parents: 15884
diff changeset
1366 } else if (preceding_space && !in_italic && !g_unichar_isspace(*(p+1))) {
15587
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1367 italic_count++;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1368 in_italic = TRUE;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1369 }
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1370 preceding_space = TRUE;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1371 } else if (c == '<' && !in_tag) {
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1372 in_tag = TRUE;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1373 } else if (c == '>' && in_tag) {
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1374 in_tag = FALSE;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1375 } else if (!in_tag) {
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1376 if (g_unichar_isspace(c))
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1377 preceding_space = TRUE;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1378 else
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1379 preceding_space = FALSE;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1380 }
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1381 }
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1382
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1383 str = g_string_new(NULL);
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1384 in_bold = in_italic = in_tag = FALSE;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1385 preceding_space = TRUE;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1386
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1387 for (p = text; *p != '\0'; p = g_utf8_next_char(p)) {
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1388 gunichar c = g_utf8_get_char(p);
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1389
15587
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1390 if (bold_count < 2 && italic_count < 2 && !in_bold && !in_italic) {
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1391 g_string_append(str, p);
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1392 return g_string_free(str, FALSE);
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1393 }
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1394
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1395
15587
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1396 if (c == '*' && !in_tag) {
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1397 if (in_bold &&
15587
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1398 (g_unichar_isspace(*(p+1))||*(p+1)=='<')) { /* This is safe in UTF-8 */
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1399 str = g_string_append(str, "</b>");
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1400 in_bold = FALSE;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1401 bold_count--;
16988
1aaf51bf0f23 Patch #265. Fix to Google Talk formatting
Sean Egan <seanegan@pidgin.im>
parents: 15884
diff changeset
1402 } else if (preceding_space && bold_count > 1 && !g_unichar_isspace(*(p+1))) {
15587
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1403 str = g_string_append(str, "<b>");
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1404 bold_count--;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1405 in_bold = TRUE;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1406 } else {
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1407 str = g_string_append_unichar(str, c);
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1408 }
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1409 preceding_space = TRUE;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1410 } else if (c == '_' && !in_tag) {
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1411 if (in_italic &&
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1412 (g_unichar_isspace(*(p+1))||*(p+1)=='<')) {
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1413 str = g_string_append(str, "</i>");
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1414 italic_count--;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1415 in_italic = FALSE;
16988
1aaf51bf0f23 Patch #265. Fix to Google Talk formatting
Sean Egan <seanegan@pidgin.im>
parents: 15884
diff changeset
1416 } else if (preceding_space && italic_count > 1 && !g_unichar_isspace(*(p+1))) {
15587
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1417 str = g_string_append(str, "<i>");
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1418 italic_count--;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1419 in_italic = TRUE;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1420 } else {
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1421 str = g_string_append_unichar(str, c);
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1422 }
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1423 preceding_space = TRUE;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1424 } else if (c == '<' && !in_tag) {
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1425 str = g_string_append_unichar(str, c);
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1426 in_tag = TRUE;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1427 } else if (c == '>' && in_tag) {
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1428 str = g_string_append_unichar(str, c);
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1429 in_tag = FALSE;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1430 } else if (!in_tag) {
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1431 str = g_string_append_unichar(str, c);
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1432 if (g_unichar_isspace(c))
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1433 preceding_space = TRUE;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1434 else
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1435 preceding_space = FALSE;
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1436 } else {
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1437 str = g_string_append_unichar(str, c);
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1438 }
18233
32e258000a57 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17327
diff changeset
1439 }
15587
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1440 return g_string_free(str, FALSE);
cbedd543bfae Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents: 15530
diff changeset
1441 }
21195
fd63ef5027d7 Music support for Google Talk
Sean Egan <seanegan@pidgin.im>
parents: 20107
diff changeset
1442
fd63ef5027d7 Music support for Google Talk
Sean Egan <seanegan@pidgin.im>
parents: 20107
diff changeset
1443 void jabber_google_presence_incoming(JabberStream *js, const char *user, JabberBuddyResource *jbr)
fd63ef5027d7 Music support for Google Talk
Sean Egan <seanegan@pidgin.im>
parents: 20107
diff changeset
1444 {
fd63ef5027d7 Music support for Google Talk
Sean Egan <seanegan@pidgin.im>
parents: 20107
diff changeset
1445 if (!js->googletalk)
fd63ef5027d7 Music support for Google Talk
Sean Egan <seanegan@pidgin.im>
parents: 20107
diff changeset
1446 return;
27774
343bf770ea2a We have a convenience function to do this. Also, plug a leak of the status
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27701
diff changeset
1447 if (jbr->status && purple_str_has_prefix(jbr->status, "♫ ")) {
21195
fd63ef5027d7 Music support for Google Talk
Sean Egan <seanegan@pidgin.im>
parents: 20107
diff changeset
1448 purple_prpl_got_user_status(js->gc->account, user, "tune",
fd63ef5027d7 Music support for Google Talk
Sean Egan <seanegan@pidgin.im>
parents: 20107
diff changeset
1449 PURPLE_TUNE_TITLE, jbr->status + strlen("♫ "), NULL);
27774
343bf770ea2a We have a convenience function to do this. Also, plug a leak of the status
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27701
diff changeset
1450 g_free(jbr->status);
21195
fd63ef5027d7 Music support for Google Talk
Sean Egan <seanegan@pidgin.im>
parents: 20107
diff changeset
1451 jbr->status = NULL;
fd63ef5027d7 Music support for Google Talk
Sean Egan <seanegan@pidgin.im>
parents: 20107
diff changeset
1452 } else {
fd63ef5027d7 Music support for Google Talk
Sean Egan <seanegan@pidgin.im>
parents: 20107
diff changeset
1453 purple_prpl_got_user_status_deactive(js->gc->account, user, "tune");
fd63ef5027d7 Music support for Google Talk
Sean Egan <seanegan@pidgin.im>
parents: 20107
diff changeset
1454 }
fd63ef5027d7 Music support for Google Talk
Sean Egan <seanegan@pidgin.im>
parents: 20107
diff changeset
1455 }
fd63ef5027d7 Music support for Google Talk
Sean Egan <seanegan@pidgin.im>
parents: 20107
diff changeset
1456
fd63ef5027d7 Music support for Google Talk
Sean Egan <seanegan@pidgin.im>
parents: 20107
diff changeset
1457 char *jabber_google_presence_outgoing(PurpleStatus *tune)
fd63ef5027d7 Music support for Google Talk
Sean Egan <seanegan@pidgin.im>
parents: 20107
diff changeset
1458 {
21714
5956ea2cb4af don't set the current tune title if it's NULL
Ka-Hing Cheung <khc@pidgin.im>
parents: 21204
diff changeset
1459 const char *attr = purple_status_get_attr_string(tune, PURPLE_TUNE_TITLE);
5956ea2cb4af don't set the current tune title if it's NULL
Ka-Hing Cheung <khc@pidgin.im>
parents: 21204
diff changeset
1460 return attr ? g_strdup_printf("♫ %s", attr) : g_strdup("");
21195
fd63ef5027d7 Music support for Google Talk
Sean Egan <seanegan@pidgin.im>
parents: 20107
diff changeset
1461 }
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1462
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1463 static void
27155
53502d71efdd Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents: 27089
diff changeset
1464 jabber_google_stun_lookup_cb(GSList *hosts, gpointer data,
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1465 const char *error_message)
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1466 {
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1467 JabberStream *js = (JabberStream *) data;
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1468
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1469 if (error_message) {
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1470 purple_debug_error("jabber", "Google STUN lookup failed: %s\n",
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1471 error_message);
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1472 g_slist_free(hosts);
28317
e706c9dcce0a jabber: Unset the PurpleDnsQueryData when a query fails. Refs #9274.
Paul Aurich <darkrain42@pidgin.im>
parents: 28076
diff changeset
1473 js->stun_query = NULL;
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1474 return;
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1475 }
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1476
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1477 if (hosts && g_slist_next(hosts)) {
27155
53502d71efdd Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents: 27089
diff changeset
1478 struct sockaddr *addr = g_slist_next(hosts)->data;
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1479 char dst[INET6_ADDRSTRLEN];
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1480 int port;
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1481
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1482 if (addr->sa_family == AF_INET6) {
27155
53502d71efdd Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents: 27089
diff changeset
1483 inet_ntop(addr->sa_family, &((struct sockaddr_in6 *) addr)->sin6_addr,
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1484 dst, sizeof(dst));
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1485 port = ntohs(((struct sockaddr_in6 *) addr)->sin6_port);
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1486 } else {
27155
53502d71efdd Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents: 27089
diff changeset
1487 inet_ntop(addr->sa_family, &((struct sockaddr_in *) addr)->sin_addr,
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1488 dst, sizeof(dst));
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1489 port = ntohs(((struct sockaddr_in *) addr)->sin_port);
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1490 }
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1491
28318
e02ded498369 jabber: Simplify; js is the callback data and can't be NULL.
Paul Aurich <darkrain42@pidgin.im>
parents: 28317
diff changeset
1492 if (js->stun_ip)
e02ded498369 jabber: Simplify; js is the callback data and can't be NULL.
Paul Aurich <darkrain42@pidgin.im>
parents: 28317
diff changeset
1493 g_free(js->stun_ip);
e02ded498369 jabber: Simplify; js is the callback data and can't be NULL.
Paul Aurich <darkrain42@pidgin.im>
parents: 28317
diff changeset
1494 js->stun_ip = g_strdup(dst);
e02ded498369 jabber: Simplify; js is the callback data and can't be NULL.
Paul Aurich <darkrain42@pidgin.im>
parents: 28317
diff changeset
1495 js->stun_port = port;
e02ded498369 jabber: Simplify; js is the callback data and can't be NULL.
Paul Aurich <darkrain42@pidgin.im>
parents: 28317
diff changeset
1496
e02ded498369 jabber: Simplify; js is the callback data and can't be NULL.
Paul Aurich <darkrain42@pidgin.im>
parents: 28317
diff changeset
1497 purple_debug_info("jabber", "set Google STUN IP/port address: "
e02ded498369 jabber: Simplify; js is the callback data and can't be NULL.
Paul Aurich <darkrain42@pidgin.im>
parents: 28317
diff changeset
1498 "%s:%d\n", dst, port);
e02ded498369 jabber: Simplify; js is the callback data and can't be NULL.
Paul Aurich <darkrain42@pidgin.im>
parents: 28317
diff changeset
1499
e02ded498369 jabber: Simplify; js is the callback data and can't be NULL.
Paul Aurich <darkrain42@pidgin.im>
parents: 28317
diff changeset
1500 /* unmark ongoing query */
e02ded498369 jabber: Simplify; js is the callback data and can't be NULL.
Paul Aurich <darkrain42@pidgin.im>
parents: 28317
diff changeset
1501 js->stun_query = NULL;
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1502 }
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1503
26782
0d61de90ae02 Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <darkrain42@pidgin.im>
parents: 26746
diff changeset
1504 while (hosts != NULL) {
0d61de90ae02 Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <darkrain42@pidgin.im>
parents: 26746
diff changeset
1505 hosts = g_slist_delete_link(hosts, hosts);
0d61de90ae02 Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <darkrain42@pidgin.im>
parents: 26746
diff changeset
1506 /* Free the address */
0d61de90ae02 Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <darkrain42@pidgin.im>
parents: 26746
diff changeset
1507 g_free(hosts->data);
0d61de90ae02 Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <darkrain42@pidgin.im>
parents: 26746
diff changeset
1508 hosts = g_slist_delete_link(hosts, hosts);
0d61de90ae02 Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <darkrain42@pidgin.im>
parents: 26746
diff changeset
1509 }
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1510 }
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1511
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1512 static void
26693
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1513 jabber_google_jingle_info_common(JabberStream *js, const char *from,
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1514 JabberIqType type, xmlnode *query)
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1515 {
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1516 const xmlnode *stun = xmlnode_get_child(query, "stun");
28445
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
1517 const xmlnode *relay = xmlnode_get_child(query, "relay");
26693
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1518 gchar *my_bare_jid;
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1519
26693
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1520 /*
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1521 * Make sure that random people aren't sending us STUN servers. Per
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1522 * http://code.google.com/apis/talk/jep_extensions/jingleinfo.html, these
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1523 * stanzas are stamped from our bare JID.
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1524 */
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1525 if (from) {
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1526 my_bare_jid = g_strdup_printf("%s@%s", js->user->node, js->user->domain);
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1527 if (!purple_strequal(from, my_bare_jid)) {
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1528 purple_debug_warning("jabber", "got google:jingleinfo with invalid from (%s)\n",
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1529 from);
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1530 g_free(my_bare_jid);
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1531 return;
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1532 }
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1533
26693
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1534 g_free(my_bare_jid);
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1535 }
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1536
26693
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1537 if (type == JABBER_IQ_ERROR || type == JABBER_IQ_GET)
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1538 return;
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1539
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1540 purple_debug_info("jabber", "got google:jingleinfo\n");
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1541
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1542 if (stun) {
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1543 xmlnode *server = xmlnode_get_child(stun, "server");
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1544
26693
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1545 if (server) {
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1546 const gchar *host = xmlnode_get_attrib(server, "host");
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1547 const gchar *udp = xmlnode_get_attrib(server, "udp");
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1548
26693
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1549 if (host && udp) {
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1550 int port = atoi(udp);
27155
53502d71efdd Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents: 27089
diff changeset
1551 /* if there, would already be an ongoing query,
26693
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1552 cancel it */
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1553 if (js->stun_query)
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1554 purple_dnsquery_destroy(js->stun_query);
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1555
27155
53502d71efdd Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents: 27089
diff changeset
1556 js->stun_query = purple_dnsquery_a(host, port,
26693
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1557 jabber_google_stun_lookup_cb, js);
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1558 }
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1559 }
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1560 }
28445
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
1561
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
1562 if (relay) {
28566
9e40f6ca4567 Can now sucessfully request relay info through HTTP
Marcus Lundblad <malu@pidgin.im>
parents: 28445
diff changeset
1563 xmlnode *token = xmlnode_get_child(relay, "token");
9e40f6ca4567 Can now sucessfully request relay info through HTTP
Marcus Lundblad <malu@pidgin.im>
parents: 28445
diff changeset
1564 xmlnode *server = xmlnode_get_child(relay, "server");
28445
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
1565
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
1566 if (token) {
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
1567 gchar *relay_token = xmlnode_get_data(token);
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
1568
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
1569 /* we let js own the string returned from xmlnode_get_data */
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
1570 js->google_relay_token = relay_token;
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
1571 }
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
1572
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
1573 if (server) {
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
1574 js->google_relay_host =
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
1575 g_strdup(xmlnode_get_attrib(server, "host"));
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
1576 }
c3dbe0b64f44 Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents: 28372
diff changeset
1577 }
26693
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1578 }
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1579
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1580 static void
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1581 jabber_google_jingle_info_cb(JabberStream *js, const char *from,
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1582 JabberIqType type, const char *id,
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1583 xmlnode *packet, gpointer data)
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1584 {
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1585 xmlnode *query = xmlnode_get_child_with_namespace(packet, "query",
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1586 GOOGLE_JINGLE_INFO_NAMESPACE);
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1587
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1588 if (query)
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1589 jabber_google_jingle_info_common(js, from, type, query);
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1590 else
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1591 purple_debug_warning("jabber", "Got invalid google:jingleinfo\n");
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1592 }
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1593
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1594 void
26693
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1595 jabber_google_handle_jingle_info(JabberStream *js, const char *from,
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1596 JabberIqType type, const char *id,
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1597 xmlnode *child)
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1598 {
26693
0365dcbeaff6 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents: 26692
diff changeset
1599 jabber_google_jingle_info_common(js, from, type, child);
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1600 }
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1601
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1602 void
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1603 jabber_google_send_jingle_info(JabberStream *js)
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1604 {
27155
53502d71efdd Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents: 27089
diff changeset
1605 JabberIq *jingle_info =
26286
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1606 jabber_iq_new_query(js, JABBER_IQ_GET, GOOGLE_JINGLE_INFO_NAMESPACE);
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1607
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1608 jabber_iq_set_callback(jingle_info, jabber_google_jingle_info_cb,
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1609 NULL);
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1610 purple_debug_info("jabber", "sending google:jingleinfo query\n");
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1611 jabber_iq_send(jingle_info);
443041606e32 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents: 26264
diff changeset
1612 }
28667
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1613
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1614 void google_buddy_node_chat(PurpleBlistNode *node, gpointer data)
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1615 {
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1616 PurpleBuddy *buddy;
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1617 PurpleConnection *gc;
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1618 JabberStream *js;
28669
f67839ca0064 jabber: Use the newly refactored code to simplify "Initiate Chat".
Paul Aurich <darkrain42@pidgin.im>
parents: 28667
diff changeset
1619 JabberChat *chat;
28667
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1620 gchar *room;
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1621 guint32 tmp, a, b;
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1622
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1623 g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node));
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1624
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1625 buddy = PURPLE_BUDDY(node);
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1626 gc = purple_account_get_connection(purple_buddy_get_account(buddy));
28669
f67839ca0064 jabber: Use the newly refactored code to simplify "Initiate Chat".
Paul Aurich <darkrain42@pidgin.im>
parents: 28667
diff changeset
1627 g_return_if_fail(gc != NULL);
28667
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1628 js = purple_connection_get_protocol_data(gc);
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1629
28669
f67839ca0064 jabber: Use the newly refactored code to simplify "Initiate Chat".
Paul Aurich <darkrain42@pidgin.im>
parents: 28667
diff changeset
1630 /* Generate a version 4 UUID */
28667
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1631 tmp = g_random_int();
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1632 a = 0x4000 | (tmp & 0xFFF); /* 0x4000 to 0x4FFF */
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1633 tmp >>= 12;
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1634 b = ((1 << 3) << 12) | (tmp & 0x3FFF); /* 0x8000 to 0xBFFF */
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1635
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1636 tmp = g_random_int();
28669
f67839ca0064 jabber: Use the newly refactored code to simplify "Initiate Chat".
Paul Aurich <darkrain42@pidgin.im>
parents: 28667
diff changeset
1637 room = g_strdup_printf("private-chat-%08x-%04x-%04x-%04x-%04x%08x",
28667
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1638 g_random_int(),
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1639 tmp & 0xFFFF,
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1640 a,
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1641 b,
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1642 (tmp >> 16) & 0xFFFF, g_random_int());
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1643
28669
f67839ca0064 jabber: Use the newly refactored code to simplify "Initiate Chat".
Paul Aurich <darkrain42@pidgin.im>
parents: 28667
diff changeset
1644 chat = jabber_join_chat(js, room, GOOGLE_GROUPCHAT_SERVER, js->user->node,
f67839ca0064 jabber: Use the newly refactored code to simplify "Initiate Chat".
Paul Aurich <darkrain42@pidgin.im>
parents: 28667
diff changeset
1645 NULL, NULL);
f67839ca0064 jabber: Use the newly refactored code to simplify "Initiate Chat".
Paul Aurich <darkrain42@pidgin.im>
parents: 28667
diff changeset
1646 if (chat) {
f67839ca0064 jabber: Use the newly refactored code to simplify "Initiate Chat".
Paul Aurich <darkrain42@pidgin.im>
parents: 28667
diff changeset
1647 chat->muc = TRUE;
f67839ca0064 jabber: Use the newly refactored code to simplify "Initiate Chat".
Paul Aurich <darkrain42@pidgin.im>
parents: 28667
diff changeset
1648 jabber_chat_invite(gc, chat->id, "", buddy->name);
28667
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1649 }
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1650
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1651 g_free(room);
7bab19738f5e jabber: Add an "Initiate Chat" blist context menu option for GTalk accounts.
Eion Robb <eion@robbmob.com>
parents: 28656
diff changeset
1652 }

mercurial