Mon, 31 Aug 2009 20:23:51 +0000
Some unfinished code to take advantage of Google's relays
| 15225 | 1 | /** |
| 15884 | 2 | * Purple is the legal property of its developers, whose names are too numerous |
| 15225 | 3 | * to list here. Please refer to the COPYRIGHT file distributed with this |
| 4 | * source distribution. | |
| 5 | * | |
| 6 | * This program is free software; you can redistribute it and/or modify | |
| 7 | * it under the terms of the GNU General Public License as published by | |
| 8 | * the Free Software Foundation; either version 2 of the License, or | |
| 9 | * (at your option) any later version. | |
| 10 | * | |
| 11 | * This program is distributed in the hope that it will be useful, | |
| 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 14 | * GNU General Public License for more details. | |
| 15 | * | |
| 16 | * You should have received a copy of the GNU General Public License | |
| 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 | 19 | */ |
| 20 | ||
| 21 | #include "internal.h" | |
| 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 | 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 | 28 | |
| 29 | #include "buddy.h" | |
| 15225 | 30 | #include "google.h" |
| 31 | #include "jabber.h" | |
| 15265 | 32 | #include "presence.h" |
| 15225 | 33 | #include "iq.h" |
| 34 | ||
|
26286
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
35 | #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
|
36 | |
|
23704
9b88c9b23aed
Use USE_VV instead of USE_FARSIGHT.
Michael Ruprecht <maiku@pidgin.im>
parents:
23700
diff
changeset
|
37 | #ifdef USE_VV |
|
23700
e47be56bdd2b
Fix compiling with the --disable-vv switch.
Michael Ruprecht <maiku@pidgin.im>
parents:
23697
diff
changeset
|
38 | |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
39 | #define NS_GOOGLE_VIDEO "http://www.google.com/session/video" |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
40 | #define NS_GOOGLE_PHONE "http://www.google.com/session/phone" |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
41 | |
|
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
|
42 | 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
|
43 | 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
|
44 | 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
|
45 | } 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
|
46 | |
|
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 | 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
|
48 | 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
|
49 | 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
|
50 | 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
|
51 | 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
|
52 | 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
|
53 | } 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
|
54 | |
|
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 | 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
|
56 | 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
|
57 | 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
|
58 | PurpleMedia *media; |
|
27155
53502d71efdd
Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents:
27089
diff
changeset
|
59 | 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
|
60 | char *remote_jid; |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
61 | gboolean video; |
|
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
|
62 | } 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
|
63 | |
|
27155
53502d71efdd
Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents:
27089
diff
changeset
|
64 | 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
|
65 | 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
|
66 | { |
|
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 | 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
|
68 | GoogleSessionId *d = (GoogleSessionId*)b; |
|
27155
53502d71efdd
Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents:
27089
diff
changeset
|
69 | |
|
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
|
70 | 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
|
71 | } |
|
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 | |
| 18233 | 73 | 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
|
74 | 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
|
75 | { |
|
593613a22e57
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents:
19882
diff
changeset
|
76 | 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
|
77 | 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
|
78 | g_free(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
|
79 | 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
|
80 | } |
|
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
|
81 | |
|
d8c2a2fc1fbf
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents:
19046
diff
changeset
|
82 | 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
|
83 | 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
|
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 | 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
|
86 | 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
|
87 | 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
|
88 | 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
|
89 | 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
|
90 | 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
|
91 | } |
|
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 | |
|
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 | static void |
|
26239
5c186583ab89
Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26238
diff
changeset
|
94 | 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
|
95 | 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
|
96 | { |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
97 | GList *candidates = purple_media_get_local_candidates( |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
98 | session->media, session_id, session->remote_jid); |
|
26229
3e786c9ebb62
Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
26223
diff
changeset
|
99 | PurpleMediaCandidate *transport; |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
100 | gboolean video = FALSE; |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
101 | |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
102 | if (!strcmp(session_id, "google-video")) |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
103 | 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
|
104 | |
|
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
|
105 | for (;candidates;candidates = candidates->next) { |
|
26485
df2f8d35564b
Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26484
diff
changeset
|
106 | JabberIq *iq; |
|
26620
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
107 | gchar *ip, *port, *pref, *username, *password; |
|
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
108 | PurpleMediaCandidateType type; |
|
26485
df2f8d35564b
Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26484
diff
changeset
|
109 | xmlnode *sess; |
|
df2f8d35564b
Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26484
diff
changeset
|
110 | xmlnode *candidate; |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
111 | guint component_id; |
|
26229
3e786c9ebb62
Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
26223
diff
changeset
|
112 | transport = (PurpleMediaCandidate*)(candidates->data); |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
113 | component_id = purple_media_candidate_get_component_id( |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
114 | transport); |
|
26286
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
115 | |
|
26485
df2f8d35564b
Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26484
diff
changeset
|
116 | iq = jabber_iq_new(session->js, JABBER_IQ_SET); |
|
df2f8d35564b
Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26484
diff
changeset
|
117 | sess = google_session_create_xmlnode(session, "candidates"); |
|
df2f8d35564b
Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26484
diff
changeset
|
118 | xmlnode_insert_child(iq->node, sess); |
|
df2f8d35564b
Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26484
diff
changeset
|
119 | xmlnode_set_attrib(iq->node, "to", session->remote_jid); |
|
df2f8d35564b
Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26484
diff
changeset
|
120 | |
|
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
|
121 | 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
|
122 | |
|
26620
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
123 | ip = purple_media_candidate_get_ip(transport); |
|
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
124 | port = g_strdup_printf("%d", |
|
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
125 | purple_media_candidate_get_port(transport)); |
|
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
126 | pref = g_strdup_printf("%f", |
|
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
127 | purple_media_candidate_get_priority(transport) |
|
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
128 | /1000.0); |
|
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
129 | username = purple_media_candidate_get_username(transport); |
|
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
130 | password = purple_media_candidate_get_password(transport); |
|
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
131 | 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
|
132 | |
|
26620
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
133 | 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
|
134 | xmlnode_set_attrib(candidate, "port", port); |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
135 | xmlnode_set_attrib(candidate, "name", |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
136 | component_id == PURPLE_MEDIA_COMPONENT_RTP ? |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
137 | video ? "video_rtp" : "rtp" : |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
138 | component_id == PURPLE_MEDIA_COMPONENT_RTCP ? |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
139 | video ? "video_rtcp" : "rtcp" : "none"); |
|
26620
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
140 | xmlnode_set_attrib(candidate, "username", username); |
|
26201
32baf68eeedd
Fix receiving voice calls from Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26199
diff
changeset
|
141 | /* |
|
32baf68eeedd
Fix receiving voice calls from Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26199
diff
changeset
|
142 | * 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
|
143 | * 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
|
144 | * requires this to be set. |
|
32baf68eeedd
Fix receiving voice calls from Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26199
diff
changeset
|
145 | */ |
|
32baf68eeedd
Fix receiving voice calls from Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26199
diff
changeset
|
146 | xmlnode_set_attrib(candidate, "password", |
|
26620
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
147 | 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
|
148 | xmlnode_set_attrib(candidate, "preference", pref); |
|
26620
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
149 | xmlnode_set_attrib(candidate, "protocol", |
|
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
150 | purple_media_candidate_get_protocol(transport) |
|
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
151 | == PURPLE_MEDIA_NETWORK_PROTOCOL_UDP ? |
|
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
152 | "udp" : "tcp"); |
|
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
153 | 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
|
154 | PURPLE_MEDIA_CANDIDATE_TYPE_HOST ? "local" : |
|
26620
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
155 | type == |
|
26229
3e786c9ebb62
Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
26223
diff
changeset
|
156 | PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX ? "stun" : |
|
26620
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
157 | type == |
|
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
158 | PURPLE_MEDIA_CANDIDATE_TYPE_RELAY ? "relay" : |
|
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
159 | 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
|
160 | 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
|
161 | 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
|
162 | xmlnode_insert_child(sess, candidate); |
|
26485
df2f8d35564b
Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26484
diff
changeset
|
163 | |
|
26620
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
164 | g_free(ip); |
|
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
165 | g_free(port); |
|
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
166 | g_free(pref); |
|
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
167 | g_free(username); |
|
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
168 | g_free(password); |
|
a34fb2386da5
Hide and GObjectify PurpleMediaCandidate.
Michael Ruprecht <maiku@pidgin.im>
parents:
26618
diff
changeset
|
169 | |
|
26485
df2f8d35564b
Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26484
diff
changeset
|
170 | 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
|
171 | } |
|
d8c2a2fc1fbf
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents:
19046
diff
changeset
|
172 | } |
|
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 | |
|
19885
593613a22e57
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents:
19882
diff
changeset
|
174 | static void |
|
26434
46d8db20a062
Remove ready-new from use.
Michael Ruprecht <maiku@pidgin.im>
parents:
26337
diff
changeset
|
175 | google_session_ready(GoogleSession *session) |
|
26205
f20bb7e9e311
Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26201
diff
changeset
|
176 | { |
|
26434
46d8db20a062
Remove ready-new from use.
Michael Ruprecht <maiku@pidgin.im>
parents:
26337
diff
changeset
|
177 | PurpleMedia *media = session->media; |
|
46d8db20a062
Remove ready-new from use.
Michael Ruprecht <maiku@pidgin.im>
parents:
26337
diff
changeset
|
178 | if (purple_media_codecs_ready(media, NULL) && |
|
46d8db20a062
Remove ready-new from use.
Michael Ruprecht <maiku@pidgin.im>
parents:
26337
diff
changeset
|
179 | 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
|
180 | 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
|
181 | session->js->user->node, |
|
f20bb7e9e311
Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26201
diff
changeset
|
182 | session->js->user->domain, |
|
f20bb7e9e311
Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26201
diff
changeset
|
183 | session->js->user->resource); |
|
26434
46d8db20a062
Remove ready-new from use.
Michael Ruprecht <maiku@pidgin.im>
parents:
26337
diff
changeset
|
184 | JabberIq *iq; |
|
26239
5c186583ab89
Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26238
diff
changeset
|
185 | 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
|
186 | GList *codecs, *iter; |
|
26434
46d8db20a062
Remove ready-new from use.
Michael Ruprecht <maiku@pidgin.im>
parents:
26337
diff
changeset
|
187 | 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
|
188 | |
|
26434
46d8db20a062
Remove ready-new from use.
Michael Ruprecht <maiku@pidgin.im>
parents:
26337
diff
changeset
|
189 | if (!is_initiator && |
|
46d8db20a062
Remove ready-new from use.
Michael Ruprecht <maiku@pidgin.im>
parents:
26337
diff
changeset
|
190 | !purple_media_accepted(media, NULL, NULL)) { |
|
46d8db20a062
Remove ready-new from use.
Michael Ruprecht <maiku@pidgin.im>
parents:
26337
diff
changeset
|
191 | g_free(me); |
|
46d8db20a062
Remove ready-new from use.
Michael Ruprecht <maiku@pidgin.im>
parents:
26337
diff
changeset
|
192 | return; |
|
46d8db20a062
Remove ready-new from use.
Michael Ruprecht <maiku@pidgin.im>
parents:
26337
diff
changeset
|
193 | } |
|
46d8db20a062
Remove ready-new from use.
Michael Ruprecht <maiku@pidgin.im>
parents:
26337
diff
changeset
|
194 | |
|
46d8db20a062
Remove ready-new from use.
Michael Ruprecht <maiku@pidgin.im>
parents:
26337
diff
changeset
|
195 | iq = jabber_iq_new(session->js, JABBER_IQ_SET); |
|
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 | if (is_initiator) { |
|
26205
f20bb7e9e311
Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26201
diff
changeset
|
198 | 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
|
199 | 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
|
200 | 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
|
201 | } else { |
|
26485
df2f8d35564b
Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26484
diff
changeset
|
202 | google_session_send_candidates(session->media, |
|
df2f8d35564b
Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26484
diff
changeset
|
203 | "google-voice", session->remote_jid, |
|
df2f8d35564b
Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26484
diff
changeset
|
204 | session); |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
205 | google_session_send_candidates(session->media, |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
206 | "google-video", session->remote_jid, |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
207 | session); |
|
26239
5c186583ab89
Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26238
diff
changeset
|
208 | 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
|
209 | 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
|
210 | 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
|
211 | } |
|
5c186583ab89
Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26238
diff
changeset
|
212 | 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
|
213 | desc = xmlnode_new_child(sess, "description"); |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
214 | if (session->video) |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
215 | xmlnode_set_namespace(desc, NS_GOOGLE_VIDEO); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
216 | else |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
217 | xmlnode_set_namespace(desc, NS_GOOGLE_PHONE); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
218 | |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
219 | codecs = purple_media_get_codecs(media, "google-video"); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
220 | |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
221 | for (iter = codecs; iter; iter = g_list_next(iter)) { |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
222 | PurpleMediaCodec *codec = (PurpleMediaCodec*)iter->data; |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
223 | gchar *id = g_strdup_printf("%d", |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
224 | purple_media_codec_get_id(codec)); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
225 | gchar *encoding_name = |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
226 | purple_media_codec_get_encoding_name(codec); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
227 | payload = xmlnode_new_child(desc, "payload-type"); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
228 | xmlnode_set_attrib(payload, "id", id); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
229 | xmlnode_set_attrib(payload, "name", encoding_name); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
230 | xmlnode_set_attrib(payload, "width", "320"); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
231 | xmlnode_set_attrib(payload, "height", "200"); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
232 | xmlnode_set_attrib(payload, "framerate", "30"); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
233 | g_free(encoding_name); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
234 | g_free(id); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
235 | } |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
236 | 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
|
237 | |
|
5c186583ab89
Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26238
diff
changeset
|
238 | 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
|
239 | |
|
26239
5c186583ab89
Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26238
diff
changeset
|
240 | 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
|
241 | PurpleMediaCodec *codec = (PurpleMediaCodec*)iter->data; |
|
26618
9e9e610ca1a1
Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents:
26514
diff
changeset
|
242 | gchar *id = g_strdup_printf("%d", |
|
9e9e610ca1a1
Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents:
26514
diff
changeset
|
243 | purple_media_codec_get_id(codec)); |
|
9e9e610ca1a1
Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents:
26514
diff
changeset
|
244 | gchar *encoding_name = |
|
9e9e610ca1a1
Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents:
26514
diff
changeset
|
245 | purple_media_codec_get_encoding_name(codec); |
|
9e9e610ca1a1
Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents:
26514
diff
changeset
|
246 | gchar *clock_rate = g_strdup_printf("%d", |
|
9e9e610ca1a1
Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents:
26514
diff
changeset
|
247 | 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
|
248 | payload = xmlnode_new_child(desc, "payload-type"); |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
249 | if (session->video) |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
250 | 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
|
251 | xmlnode_set_attrib(payload, "id", id); |
|
27203
f11c3c9a7f53
Make Gmail accept speex as the codec.
Michael Ruprecht <maiku@pidgin.im>
parents:
27202
diff
changeset
|
252 | /* |
|
f11c3c9a7f53
Make Gmail accept speex as the codec.
Michael Ruprecht <maiku@pidgin.im>
parents:
27202
diff
changeset
|
253 | * 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
|
254 | * 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
|
255 | */ |
|
f11c3c9a7f53
Make Gmail accept speex as the codec.
Michael Ruprecht <maiku@pidgin.im>
parents:
27202
diff
changeset
|
256 | if (purple_strequal(encoding_name, "SPEEX")) |
|
f11c3c9a7f53
Make Gmail accept speex as the codec.
Michael Ruprecht <maiku@pidgin.im>
parents:
27202
diff
changeset
|
257 | xmlnode_set_attrib(payload, "name", "speex"); |
|
f11c3c9a7f53
Make Gmail accept speex as the codec.
Michael Ruprecht <maiku@pidgin.im>
parents:
27202
diff
changeset
|
258 | else |
|
f11c3c9a7f53
Make Gmail accept speex as the codec.
Michael Ruprecht <maiku@pidgin.im>
parents:
27202
diff
changeset
|
259 | 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
|
260 | 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
|
261 | g_free(clock_rate); |
|
26618
9e9e610ca1a1
Hide and gobjectify PurpleMediaCodec.
Michael Ruprecht <maiku@pidgin.im>
parents:
26514
diff
changeset
|
262 | 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
|
263 | g_free(id); |
|
5c186583ab89
Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26238
diff
changeset
|
264 | } |
|
5c186583ab89
Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26238
diff
changeset
|
265 | 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
|
266 | |
|
26239
5c186583ab89
Convert the GTalk code to completely use the new ready signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26238
diff
changeset
|
267 | 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
|
268 | |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
269 | if (is_initiator) { |
|
26485
df2f8d35564b
Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26484
diff
changeset
|
270 | google_session_send_candidates(session->media, |
|
df2f8d35564b
Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26484
diff
changeset
|
271 | "google-voice", session->remote_jid, |
|
df2f8d35564b
Send candidates more like GMail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26484
diff
changeset
|
272 | session); |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
273 | google_session_send_candidates(session->media, |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
274 | "google-video", session->remote_jid, |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
275 | session); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
276 | } |
|
26438
786a8c41d80f
Don't let initiate or accept be sent again with Google Voice.
Michael Ruprecht <maiku@pidgin.im>
parents:
26434
diff
changeset
|
277 | |
|
786a8c41d80f
Don't let initiate or accept be sent again with Google Voice.
Michael Ruprecht <maiku@pidgin.im>
parents:
26434
diff
changeset
|
278 | 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
|
279 | 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
|
280 | } |
|
f20bb7e9e311
Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26201
diff
changeset
|
281 | } |
|
f20bb7e9e311
Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26201
diff
changeset
|
282 | |
|
26238
544a16676559
Use the state-changed signal in GTalk code.
Michael Ruprecht <maiku@pidgin.im>
parents:
26232
diff
changeset
|
283 | static void |
|
26449
9e381dc6ed24
Rename state-changed enum and values.
Michael Ruprecht <maiku@pidgin.im>
parents:
26443
diff
changeset
|
284 | 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
|
285 | gchar *sid, gchar *name, GoogleSession *session) |
|
544a16676559
Use the state-changed signal in GTalk code.
Michael Ruprecht <maiku@pidgin.im>
parents:
26232
diff
changeset
|
286 | { |
|
544a16676559
Use the state-changed signal in GTalk code.
Michael Ruprecht <maiku@pidgin.im>
parents:
26232
diff
changeset
|
287 | if (sid == NULL && name == NULL) { |
|
26449
9e381dc6ed24
Rename state-changed enum and values.
Michael Ruprecht <maiku@pidgin.im>
parents:
26443
diff
changeset
|
288 | 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
|
289 | 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
|
290 | } |
|
b68f5a57853a
Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26438
diff
changeset
|
291 | } |
|
b68f5a57853a
Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26438
diff
changeset
|
292 | } |
|
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 | static void |
|
26443
511064e5b314
Use the right enum for the parameter.
Michael Ruprecht <maiku@pidgin.im>
parents:
26442
diff
changeset
|
295 | 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
|
296 | 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
|
297 | GoogleSession *session) |
|
26442
b68f5a57853a
Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26438
diff
changeset
|
298 | { |
|
28372
2e425d79d30b
Handle the local accept signal with GTalk/Gmail. This was causing calls
Michael Ruprecht <maiku@pidgin.im>
parents:
28329
diff
changeset
|
299 | 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
|
300 | return; |
|
2e425d79d30b
Handle the local accept signal with GTalk/Gmail. This was causing calls
Michael Ruprecht <maiku@pidgin.im>
parents:
28329
diff
changeset
|
301 | |
|
26442
b68f5a57853a
Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26438
diff
changeset
|
302 | 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
|
303 | xmlnode *sess; |
|
b68f5a57853a
Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26438
diff
changeset
|
304 | 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
|
305 | |
|
26442
b68f5a57853a
Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26438
diff
changeset
|
306 | 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
|
307 | 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
|
308 | 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
|
309 | |
|
26442
b68f5a57853a
Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26438
diff
changeset
|
310 | 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
|
311 | } 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
|
312 | xmlnode *sess; |
|
b68f5a57853a
Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26438
diff
changeset
|
313 | 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
|
314 | |
|
b68f5a57853a
Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26438
diff
changeset
|
315 | 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
|
316 | 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
|
317 | 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
|
318 | |
|
b68f5a57853a
Use stream-info instead of state-changed for hangup and reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26438
diff
changeset
|
319 | 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
|
320 | } 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
|
321 | google_session_ready(session); |
|
26238
544a16676559
Use the state-changed signal in GTalk code.
Michael Ruprecht <maiku@pidgin.im>
parents:
26232
diff
changeset
|
322 | } |
|
544a16676559
Use the state-changed signal in GTalk code.
Michael Ruprecht <maiku@pidgin.im>
parents:
26232
diff
changeset
|
323 | } |
|
544a16676559
Use the state-changed signal in GTalk code.
Michael Ruprecht <maiku@pidgin.im>
parents:
26232
diff
changeset
|
324 | |
|
26286
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
325 | static GParameter * |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
326 | jabber_google_session_get_params(JabberStream *js, guint *num) |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
327 | { |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
328 | guint num_params; |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
329 | GParameter *params = jingle_get_params(js, &num_params); |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
330 | 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
|
331 | |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
332 | 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
|
333 | |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
334 | 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
|
335 | 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
|
336 | 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
|
337 | 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
|
338 | |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
339 | 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
|
340 | *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
|
341 | 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
|
342 | } |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
343 | |
|
28445
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
344 | static void |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
345 | jabber_google_relay_response_cb(PurpleUtilFetchUrlData *url_data, |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
346 | 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
|
347 | const gchar *error_message) |
| 15225 | 348 | { |
|
28445
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
349 | 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
|
350 | GParameter *params; |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
351 | guint num_params; |
|
28445
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
352 | JabberStream *js = session->js; |
|
26205
f20bb7e9e311
Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26201
diff
changeset
|
353 | |
|
28445
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
354 | js->google_relay_request = NULL; |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
355 | |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
356 | 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
|
357 | |
|
28445
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
358 | 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
|
359 | 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
|
360 | url_text); |
|
26205
f20bb7e9e311
Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26201
diff
changeset
|
361 | } else { |
|
28445
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
362 | |
|
26205
f20bb7e9e311
Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26201
diff
changeset
|
363 | } |
|
f20bb7e9e311
Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26201
diff
changeset
|
364 | |
|
f20bb7e9e311
Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26201
diff
changeset
|
365 | 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
|
366 | purple_media_manager_get(), |
|
2a2d45ac9774
Switch media to store accounts rather than connections.
Michael Ruprecht <maiku@pidgin.im>
parents:
26698
diff
changeset
|
367 | 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
|
368 | "fsrtpconference", session->remote_jid, TRUE); |
|
f20bb7e9e311
Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26201
diff
changeset
|
369 | |
|
26331
d5ebef68c29d
Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents:
26286
diff
changeset
|
370 | 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
|
371 | |
|
28329
0300f09b9cd6
Gracefully handle failures to create an FsStream. This was caused by
Michael Ruprecht <maiku@pidgin.im>
parents:
28318
diff
changeset
|
372 | 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
|
373 | "candidates-prepared", |
|
0300f09b9cd6
Gracefully handle failures to create an FsStream. This was caused by
Michael Ruprecht <maiku@pidgin.im>
parents:
28318
diff
changeset
|
374 | 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
|
375 | 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
|
376 | 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
|
377 | 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
|
378 | 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
|
379 | 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
|
380 | 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
|
381 | |
|
26286
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
382 | params = jabber_google_session_get_params(js, &num_params); |
|
26205
f20bb7e9e311
Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26201
diff
changeset
|
383 | |
|
f20bb7e9e311
Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26201
diff
changeset
|
384 | if (purple_media_add_stream(session->media, "google-voice", |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
385 | session->remote_jid, PURPLE_MEDIA_AUDIO, |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
386 | TRUE, "nice", num_params, params) == FALSE || |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
387 | (session->video && purple_media_add_stream( |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
388 | session->media, "google-video", |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
389 | session->remote_jid, PURPLE_MEDIA_VIDEO, |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
390 | 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
|
391 | 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
|
392 | 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
|
393 | g_free(params); |
|
26495
52846ebe1c7d
Don't assume a PurpleMedia instance will be created immediately.
Michael Ruprecht <maiku@pidgin.im>
parents:
26485
diff
changeset
|
394 | return FALSE; |
|
26205
f20bb7e9e311
Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26201
diff
changeset
|
395 | } |
|
f20bb7e9e311
Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26201
diff
changeset
|
396 | |
|
28445
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
397 | g_free(params); |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
398 | } |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
399 | |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
400 | gboolean |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
401 | 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
|
402 | { |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
403 | GoogleSession *session; |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
404 | JabberBuddy *jb; |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
405 | JabberBuddyResource *jbr; |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
406 | gchar *jid; |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
407 | |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
408 | /* 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
|
409 | 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
|
410 | if (!jb) { |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
411 | 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
|
412 | "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
|
413 | return FALSE; |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
414 | } |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
415 | 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
|
416 | if (!jbr) { |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
417 | 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
|
418 | "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
|
419 | } |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
420 | |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
421 | 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
|
422 | 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
|
423 | } else { |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
424 | jid = g_strdup(who); |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
425 | } |
|
26205
f20bb7e9e311
Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26201
diff
changeset
|
426 | |
|
28445
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
427 | 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
|
428 | 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
|
429 | 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
|
430 | 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
|
431 | session->state = SENT_INITIATE; |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
432 | session->js = js; |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
433 | session->remote_jid = jid; |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
434 | |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
435 | 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
|
436 | session->video = TRUE; |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
437 | |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
438 | /* 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
|
439 | 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
|
440 | if (js->google_relay_host && js->google_relay_token) { |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
441 | const gchar *url = |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
442 | g_strdup_printf("http://%s/create_session", js->google_relay_host); |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
443 | const gchar *request = |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
444 | g_strdup_printf("GET /create_session HTTP 1.1\r\n" |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
445 | "X-Talk-Google-Relay-Auth: %s\r\n" |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
446 | "X-Google-Relay-Auth: %s\r\n", |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
447 | js->google_relay_token, js->google_relay_token); |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
448 | js->google_relay_request = |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
449 | purple_util_fetch_url_request(url, TRUE, NULL, TRUE, request, FALSE, |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
450 | jabber_google_relay_response_cb, session); |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
451 | g_free(url); |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
452 | g_free(request); |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
453 | } else { |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
454 | jabber_google_relay_response_cb(NULL, session, NULL, 0, NULL); |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
455 | } |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
456 | |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
457 | /* 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
|
458 | wrong... */ |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
459 | return TRUE; |
|
26205
f20bb7e9e311
Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26201
diff
changeset
|
460 | } |
|
f20bb7e9e311
Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26201
diff
changeset
|
461 | |
|
28076
796f5a14f70b
Fix a bunch of memory leaks reported by Josh Mueller. Refs #9822.
Paul Aurich <darkrain42@pidgin.im>
parents:
27950
diff
changeset
|
462 | static gboolean |
|
26698
417e1c82963b
And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents:
26693
diff
changeset
|
463 | google_session_handle_initiate(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
|
464 | { |
|
19885
593613a22e57
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents:
19882
diff
changeset
|
465 | JabberIq *result; |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
466 | GList *codecs = NULL, *video_codecs = 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
|
467 | xmlnode *desc_element, *codec_element; |
|
26232
f91c96072586
Wrap FsCodec and remove the Farsight2 include from media.h.
Michael Ruprecht <maiku@pidgin.im>
parents:
26229
diff
changeset
|
468 | PurpleMediaCodec *codec; |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
469 | const char *xmlns; |
|
26286
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
470 | GParameter *params; |
|
27155
53502d71efdd
Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents:
27089
diff
changeset
|
471 | guint 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
|
472 | |
|
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
|
473 | if (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
|
474 | purple_debug_error("jabber", "Received initiate for active session.\n"); |
|
28076
796f5a14f70b
Fix a bunch of memory leaks reported by Josh Mueller. Refs #9822.
Paul Aurich <darkrain42@pidgin.im>
parents:
27950
diff
changeset
|
475 | return FALSE; |
|
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
|
476 | } |
|
d8c2a2fc1fbf
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents:
19046
diff
changeset
|
477 | |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
478 | desc_element = xmlnode_get_child(sess, "description"); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
479 | xmlns = xmlnode_get_namespace(desc_element); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
480 | |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
481 | if (purple_strequal(xmlns, NS_GOOGLE_PHONE)) |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
482 | session->video = FALSE; |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
483 | else if (purple_strequal(xmlns, NS_GOOGLE_VIDEO)) |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
484 | session->video = TRUE; |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
485 | else { |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
486 | purple_debug_error("jabber", "Received initiate with " |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
487 | "invalid namespace %s.\n", xmlns); |
|
28076
796f5a14f70b
Fix a bunch of memory leaks reported by Josh Mueller. Refs #9822.
Paul Aurich <darkrain42@pidgin.im>
parents:
27950
diff
changeset
|
488 | return FALSE; |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
489 | } |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
490 | |
|
26746
2a2d45ac9774
Switch media to store accounts rather than connections.
Michael Ruprecht <maiku@pidgin.im>
parents:
26698
diff
changeset
|
491 | session->media = purple_media_manager_create_media( |
|
2a2d45ac9774
Switch media to store accounts rather than connections.
Michael Ruprecht <maiku@pidgin.im>
parents:
26698
diff
changeset
|
492 | purple_media_manager_get(), |
|
2a2d45ac9774
Switch media to store accounts rather than connections.
Michael Ruprecht <maiku@pidgin.im>
parents:
26698
diff
changeset
|
493 | purple_connection_get_account(js->gc), |
|
2a2d45ac9774
Switch media to store accounts rather than connections.
Michael Ruprecht <maiku@pidgin.im>
parents:
26698
diff
changeset
|
494 | "fsrtpconference", session->remote_jid, FALSE); |
|
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
|
495 | |
|
26331
d5ebef68c29d
Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents:
26286
diff
changeset
|
496 | 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
|
497 | |
|
28329
0300f09b9cd6
Gracefully handle failures to create an FsStream. This was caused by
Michael Ruprecht <maiku@pidgin.im>
parents:
28318
diff
changeset
|
498 | 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
|
499 | "candidates-prepared", |
|
0300f09b9cd6
Gracefully handle failures to create an FsStream. This was caused by
Michael Ruprecht <maiku@pidgin.im>
parents:
28318
diff
changeset
|
500 | 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
|
501 | 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
|
502 | 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
|
503 | 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
|
504 | 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
|
505 | 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
|
506 | 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
|
507 | |
|
26286
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
508 | params = jabber_google_session_get_params(js, &num_params); |
|
26164
20f15fbe9b21
Very basic receive only GTalk audio sessions.
Michael Ruprecht <maiku@pidgin.im>
parents:
26160
diff
changeset
|
509 | |
|
26514
058053cffc0e
Add purple_media_is_initiator.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
510 | if (purple_media_add_stream(session->media, "google-voice", |
|
058053cffc0e
Add purple_media_is_initiator.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
511 | session->remote_jid, PURPLE_MEDIA_AUDIO, FALSE, |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
512 | "nice", num_params, params) == FALSE || |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
513 | (session->video && purple_media_add_stream( |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
514 | session->media, "google-video", |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
515 | session->remote_jid, PURPLE_MEDIA_VIDEO, |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
516 | FALSE, "nice", num_params, params) == FALSE)) { |
|
26199
a5530443b54d
End google call if stream creation fails.
Michael Ruprecht <maiku@pidgin.im>
parents:
26187
diff
changeset
|
517 | purple_media_error(session->media, "Error adding stream."); |
|
26499
759bf410db86
Remove purple_media_hangup.
Michael Ruprecht <maiku@pidgin.im>
parents:
26496
diff
changeset
|
518 | 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
|
519 | 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
|
520 | g_free(params); |
|
28076
796f5a14f70b
Fix a bunch of memory leaks reported by Josh Mueller. Refs #9822.
Paul Aurich <darkrain42@pidgin.im>
parents:
27950
diff
changeset
|
521 | return FALSE; |
|
26199
a5530443b54d
End google call if stream creation fails.
Michael Ruprecht <maiku@pidgin.im>
parents:
26187
diff
changeset
|
522 | } |
|
23697
299bafcd8eb8
Updates voice and video to use Farsight 2, gets XMPP voice conferences
Michael Ruprecht <maiku@pidgin.im>
parents:
22648
diff
changeset
|
523 | |
|
26286
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
524 | 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
|
525 | |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
526 | for (codec_element = xmlnode_get_child(desc_element, "payload-type"); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
527 | codec_element; codec_element = codec_element->next) { |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
528 | const char *id, *encoding_name, *clock_rate, |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
529 | *width, *height, *framerate; |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
530 | gboolean video; |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
531 | if (codec_element->name && |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
532 | strcmp(codec_element->name, "payload-type")) |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
533 | continue; |
|
26286
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
534 | |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
535 | 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
|
536 | 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
|
537 | id = xmlnode_get_attrib(codec_element, "id"); |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
538 | |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
539 | if (!session->video || |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
540 | (xmlns && !strcmp(xmlns, NS_GOOGLE_PHONE))) { |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
541 | clock_rate = xmlnode_get_attrib( |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
542 | codec_element, "clockrate"); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
543 | video = FALSE; |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
544 | } else { |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
545 | width = xmlnode_get_attrib(codec_element, "width"); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
546 | height = xmlnode_get_attrib(codec_element, "height"); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
547 | framerate = xmlnode_get_attrib( |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
548 | codec_element, "framerate"); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
549 | clock_rate = "90000"; |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
550 | video = TRUE; |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
551 | } |
|
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
|
552 | |
|
26981
93f90b138e5f
Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents:
26782
diff
changeset
|
553 | if (id) { |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
554 | codec = purple_media_codec_new(atoi(id), encoding_name, |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
555 | video ? PURPLE_MEDIA_VIDEO : |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
556 | PURPLE_MEDIA_AUDIO, |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
557 | clock_rate ? atoi(clock_rate) : 0); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
558 | if (video) |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
559 | video_codecs = g_list_append( |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
560 | video_codecs, codec); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
561 | else |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
562 | 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
|
563 | } |
|
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
|
564 | } |
|
19885
593613a22e57
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents:
19882
diff
changeset
|
565 | |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
566 | if (codecs) |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
567 | purple_media_set_remote_codecs(session->media, "google-voice", |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
568 | session->remote_jid, codecs); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
569 | if (video_codecs) |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
570 | purple_media_set_remote_codecs(session->media, "google-video", |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
571 | session->remote_jid, video_codecs); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
572 | |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
573 | purple_media_codec_list_free(codecs); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
574 | 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
|
575 | |
|
593613a22e57
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents:
19882
diff
changeset
|
576 | result = jabber_iq_new(js, JABBER_IQ_RESULT); |
|
26698
417e1c82963b
And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents:
26693
diff
changeset
|
577 | 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
|
578 | 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
|
579 | jabber_iq_send(result); |
|
28076
796f5a14f70b
Fix a bunch of memory leaks reported by Josh Mueller. Refs #9822.
Paul Aurich <darkrain42@pidgin.im>
parents:
27950
diff
changeset
|
580 | |
|
796f5a14f70b
Fix a bunch of memory leaks reported by Josh Mueller. Refs #9822.
Paul Aurich <darkrain42@pidgin.im>
parents:
27950
diff
changeset
|
581 | 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
|
582 | } |
|
d8c2a2fc1fbf
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents:
19046
diff
changeset
|
583 | |
|
27155
53502d71efdd
Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents:
27089
diff
changeset
|
584 | static void |
|
26698
417e1c82963b
And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents:
26693
diff
changeset
|
585 | 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
|
586 | { |
|
19885
593613a22e57
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents:
19882
diff
changeset
|
587 | JabberIq *result; |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
588 | 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
|
589 | 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
|
590 | static int name = 0; |
|
27155
53502d71efdd
Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents:
27089
diff
changeset
|
591 | char n[4]; |
|
53502d71efdd
Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents:
27089
diff
changeset
|
592 | |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
593 | for (cand = xmlnode_get_child(sess, "candidate"); cand; |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
594 | 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
|
595 | PurpleMediaCandidate *info; |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
596 | 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
|
597 | 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
|
598 | 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
|
599 | 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
|
600 | const gchar *port = xmlnode_get_attrib(cand, "port"); |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
601 | 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
|
602 | |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
603 | 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
|
604 | 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
|
605 | |
|
93f90b138e5f
Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents:
26782
diff
changeset
|
606 | 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
|
607 | |
|
93f90b138e5f
Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents:
26782
diff
changeset
|
608 | 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
|
609 | 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
|
610 | 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
|
611 | 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
|
612 | 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
|
613 | 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
|
614 | else |
|
93f90b138e5f
Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents:
26782
diff
changeset
|
615 | 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
|
616 | |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
617 | if (purple_strequal(cname, "rtcp") || |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
618 | purple_strequal(cname, "video_rtcp")) |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
619 | component_id = PURPLE_MEDIA_COMPONENT_RTCP; |
|
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 | component_id = PURPLE_MEDIA_COMPONENT_RTP; |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
622 | |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
623 | 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
|
624 | 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
|
625 | purple_strequal(protocol, "udp") ? |
|
26229
3e786c9ebb62
Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
26223
diff
changeset
|
626 | PURPLE_MEDIA_NETWORK_PROTOCOL_UDP : |
|
3e786c9ebb62
Duplicate FsCandidate to remove it from the public interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
26223
diff
changeset
|
627 | 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
|
628 | address, |
|
93f90b138e5f
Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents:
26782
diff
changeset
|
629 | 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
|
630 | 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
|
631 | "password", xmlnode_get_attrib(cand, "password"), NULL); |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
632 | if (!strncmp(cname, "video_", 6)) |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
633 | video_list = g_list_append(video_list, info); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
634 | else |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
635 | 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
|
636 | } |
|
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
|
637 | } |
|
d8c2a2fc1fbf
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents:
19046
diff
changeset
|
638 | |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
639 | if (list) |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
640 | purple_media_add_remote_candidates( |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
641 | session->media, "google-voice", |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
642 | session->remote_jid, list); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
643 | if (video_list) |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
644 | purple_media_add_remote_candidates( |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
645 | session->media, "google-video", |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
646 | 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
|
647 | purple_media_candidate_list_free(list); |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
648 | 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
|
649 | |
|
593613a22e57
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents:
19882
diff
changeset
|
650 | result = jabber_iq_new(js, JABBER_IQ_RESULT); |
|
26698
417e1c82963b
And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents:
26693
diff
changeset
|
651 | 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
|
652 | 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
|
653 | 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
|
654 | } |
|
593613a22e57
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents:
19882
diff
changeset
|
655 | |
|
593613a22e57
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents:
19882
diff
changeset
|
656 | static void |
|
26698
417e1c82963b
And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents:
26693
diff
changeset
|
657 | 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
|
658 | { |
|
f20bb7e9e311
Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26201
diff
changeset
|
659 | xmlnode *desc_element = xmlnode_get_child(sess, "description"); |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
660 | xmlnode *codec_element = xmlnode_get_child( |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
661 | desc_element, "payload-type"); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
662 | 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
|
663 | JabberIq *result = NULL; |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
664 | const gchar *xmlns = xmlnode_get_namespace(desc_element); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
665 | gboolean video = (xmlns && !strcmp(xmlns, NS_GOOGLE_VIDEO)); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
666 | |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
667 | for (; codec_element; codec_element = codec_element->next) { |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
668 | const gchar *xmlns, *encoding_name, *id, |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
669 | *clock_rate, *width, *height, *framerate; |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
670 | gboolean video_codec = FALSE; |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
671 | |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
672 | if (!purple_strequal(codec_element->name, "payload-type")) |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
673 | continue; |
|
26205
f20bb7e9e311
Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26201
diff
changeset
|
674 | |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
675 | xmlns = xmlnode_get_namespace(codec_element); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
676 | encoding_name = xmlnode_get_attrib(codec_element, "name"); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
677 | id = xmlnode_get_attrib(codec_element, "id"); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
678 | |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
679 | if (!video || purple_strequal(xmlns, NS_GOOGLE_PHONE)) |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
680 | clock_rate = xmlnode_get_attrib( |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
681 | codec_element, "clockrate"); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
682 | else { |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
683 | clock_rate = "90000"; |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
684 | width = xmlnode_get_attrib(codec_element, "width"); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
685 | height = xmlnode_get_attrib(codec_element, "height"); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
686 | framerate = xmlnode_get_attrib( |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
687 | codec_element, "framerate"); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
688 | video_codec = TRUE; |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
689 | } |
|
26205
f20bb7e9e311
Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26201
diff
changeset
|
690 | |
|
26981
93f90b138e5f
Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <darkrain42@pidgin.im>
parents:
26782
diff
changeset
|
691 | if (id && encoding_name) { |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
692 | PurpleMediaCodec *codec = purple_media_codec_new( |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
693 | atoi(id), encoding_name, |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
694 | video_codec ? PURPLE_MEDIA_VIDEO : |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
695 | 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
|
696 | clock_rate ? atoi(clock_rate) : 0); |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
697 | if (video_codec) |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
698 | video_codecs = g_list_append( |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
699 | video_codecs, codec); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
700 | else |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
701 | 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
|
702 | } |
|
26205
f20bb7e9e311
Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26201
diff
changeset
|
703 | } |
|
f20bb7e9e311
Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26201
diff
changeset
|
704 | |
|
27202
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
705 | if (codecs) |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
706 | purple_media_set_remote_codecs(session->media, "google-voice", |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
707 | session->remote_jid, codecs); |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
708 | if (video_codecs) |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
709 | purple_media_set_remote_codecs(session->media, "google-video", |
|
5244a5510e0e
Add Gmail video support.
Michael Ruprecht <maiku@pidgin.im>
parents:
27169
diff
changeset
|
710 | session->remote_jid, video_codecs); |
|
26205
f20bb7e9e311
Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26201
diff
changeset
|
711 | |
|
26501
c186275f46aa
Remove purple_media_accept.
Michael Ruprecht <maiku@pidgin.im>
parents:
26499
diff
changeset
|
712 | purple_media_stream_info(session->media, PURPLE_MEDIA_INFO_ACCEPT, |
|
c186275f46aa
Remove purple_media_accept.
Michael Ruprecht <maiku@pidgin.im>
parents:
26499
diff
changeset
|
713 | 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
|
714 | |
|
131c5b5bcf61
Fix Gtalk bug where it would terminate the session after 15 seconds.
Michael Ruprecht <maiku@pidgin.im>
parents:
26454
diff
changeset
|
715 | result = jabber_iq_new(js, JABBER_IQ_RESULT); |
|
26698
417e1c82963b
And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents:
26693
diff
changeset
|
716 | 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
|
717 | 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
|
718 | jabber_iq_send(result); |
|
26205
f20bb7e9e311
Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26201
diff
changeset
|
719 | } |
|
f20bb7e9e311
Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26201
diff
changeset
|
720 | |
|
f20bb7e9e311
Support initiating voice calls to GTalk and Gmail.
Michael Ruprecht <maiku@pidgin.im>
parents:
26201
diff
changeset
|
721 | static void |
|
26698
417e1c82963b
And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents:
26693
diff
changeset
|
722 | 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
|
723 | { |
|
26264
c062fc1f212f
Added purple_media_end and removed the purple_media_got_hangup.
Michael Ruprecht <maiku@pidgin.im>
parents:
26248
diff
changeset
|
724 | 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
|
725 | } |
|
593613a22e57
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents:
19882
diff
changeset
|
726 | |
|
593613a22e57
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@pidgin.im>
parents:
19882
diff
changeset
|
727 | static void |
|
26698
417e1c82963b
And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents:
26693
diff
changeset
|
728 | 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
|
729 | { |
|
26264
c062fc1f212f
Added purple_media_end and removed the purple_media_got_hangup.
Michael Ruprecht <maiku@pidgin.im>
parents:
26248
diff
changeset
|
730 | 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
|
731 | } |
|
d8c2a2fc1fbf
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents:
19046
diff
changeset
|
732 | |
|
d8c2a2fc1fbf
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents:
19046
diff
changeset
|
733 | static void |
|
26698
417e1c82963b
And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents:
26693
diff
changeset
|
734 | 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
|
735 | { |
|
d8c2a2fc1fbf
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents:
19046
diff
changeset
|
736 | 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
|
737 | |
|
d8c2a2fc1fbf
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents:
19046
diff
changeset
|
738 | if (!strcmp(type, "initiate")) { |
|
26698
417e1c82963b
And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents:
26693
diff
changeset
|
739 | 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
|
740 | } else if (!strcmp(type, "accept")) { |
|
26698
417e1c82963b
And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents:
26693
diff
changeset
|
741 | 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
|
742 | } else if (!strcmp(type, "reject")) { |
|
26698
417e1c82963b
And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents:
26693
diff
changeset
|
743 | 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
|
744 | } else if (!strcmp(type, "terminate")) { |
|
26698
417e1c82963b
And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents:
26693
diff
changeset
|
745 | 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
|
746 | } else if (!strcmp(type, "candidates")) { |
|
26698
417e1c82963b
And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents:
26693
diff
changeset
|
747 | 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
|
748 | } |
|
d8c2a2fc1fbf
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents:
19046
diff
changeset
|
749 | } |
|
d8c2a2fc1fbf
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents:
19046
diff
changeset
|
750 | |
|
d8c2a2fc1fbf
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents:
19046
diff
changeset
|
751 | void |
|
26698
417e1c82963b
And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents:
26693
diff
changeset
|
752 | jabber_google_session_parse(JabberStream *js, const char *from, |
|
417e1c82963b
And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents:
26693
diff
changeset
|
753 | JabberIqType type, const char *iq_id, |
|
417e1c82963b
And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents:
26693
diff
changeset
|
754 | 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
|
755 | { |
|
26331
d5ebef68c29d
Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents:
26286
diff
changeset
|
756 | 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
|
757 | 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
|
758 | |
|
d8c2a2fc1fbf
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents:
19046
diff
changeset
|
759 | 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
|
760 | |
|
26331
d5ebef68c29d
Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents:
26286
diff
changeset
|
761 | GList *iter = NULL; |
|
d5ebef68c29d
Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents:
26286
diff
changeset
|
762 | |
|
26698
417e1c82963b
And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents:
26693
diff
changeset
|
763 | 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
|
764 | 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
|
765 | |
|
23697
299bafcd8eb8
Updates voice and video to use Farsight 2, gets XMPP voice conferences
Michael Ruprecht <maiku@pidgin.im>
parents:
22648
diff
changeset
|
766 | 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
|
767 | 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
|
768 | 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
|
769 | |
|
23697
299bafcd8eb8
Updates voice and video to use Farsight 2, gets XMPP voice conferences
Michael Ruprecht <maiku@pidgin.im>
parents:
22648
diff
changeset
|
770 | 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
|
771 | 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
|
772 | 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
|
773 | |
|
26746
2a2d45ac9774
Switch media to store accounts rather than connections.
Michael Ruprecht <maiku@pidgin.im>
parents:
26698
diff
changeset
|
774 | 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
|
775 | purple_media_manager_get(), |
|
2a2d45ac9774
Switch media to store accounts rather than connections.
Michael Ruprecht <maiku@pidgin.im>
parents:
26698
diff
changeset
|
776 | purple_connection_get_account(js->gc)); |
|
26331
d5ebef68c29d
Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents:
26286
diff
changeset
|
777 | 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
|
778 | GoogleSession *gsession = |
|
d5ebef68c29d
Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents:
26286
diff
changeset
|
779 | purple_media_get_prpl_data(iter->data); |
|
d5ebef68c29d
Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents:
26286
diff
changeset
|
780 | 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
|
781 | session = gsession; |
|
d5ebef68c29d
Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents:
26286
diff
changeset
|
782 | break; |
|
d5ebef68c29d
Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents:
26286
diff
changeset
|
783 | } |
|
d5ebef68c29d
Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents:
26286
diff
changeset
|
784 | } |
|
d5ebef68c29d
Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents:
26286
diff
changeset
|
785 | if (iter != NULL) { |
|
d5ebef68c29d
Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents:
26286
diff
changeset
|
786 | g_list_free(iter); |
|
d5ebef68c29d
Remove static sessions variable from google.c.
Michael Ruprecht <maiku@pidgin.im>
parents:
26286
diff
changeset
|
787 | } |
|
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
|
788 | |
|
d8c2a2fc1fbf
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents:
19046
diff
changeset
|
789 | if (session) { |
|
26698
417e1c82963b
And google session handling
Paul Aurich <darkrain42@pidgin.im>
parents:
26693
diff
changeset
|
790 | 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
|
791 | 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
|
792 | } |
|
d8c2a2fc1fbf
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents:
19046
diff
changeset
|
793 | |
|
d8c2a2fc1fbf
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@pidgin.im>
parents:
19046
diff
changeset
|
794 | /* 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
|
795 | 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
|
796 | 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
|
797 | 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
|
798 | 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
|
799 | 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
|
800 | 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
|
801 | 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
|
802 | 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
|
803 | 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
|
804 | 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
|
805 | 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
|
806 | |
|
28329
0300f09b9cd6
Gracefully handle failures to create an FsStream. This was caused by
Michael Ruprecht <maiku@pidgin.im>
parents:
28318
diff
changeset
|
807 | 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
|
808 | } |
|
23704
9b88c9b23aed
Use USE_VV instead of USE_FARSIGHT.
Michael Ruprecht <maiku@pidgin.im>
parents:
23700
diff
changeset
|
809 | #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
|
810 | |
| 18233 | 811 | 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
|
812 | 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
|
813 | 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
|
814 | xmlnode *packet, gpointer nul) |
| 15225 | 815 | { |
| 816 | 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
|
817 | xmlnode *message; |
|
27570
e54277ae75cb
disapproval of revision '0eb69320deac850f1a1eb6ff8ea6c64103095ee8'
Paul Aurich <darkrain42@pidgin.im>
parents:
27506
diff
changeset
|
818 | const char *to, *url; |
| 15225 | 819 | const char *in_str; |
| 820 | char *to_name; | |
|
20097
f5bef80db09e
applied changes from 19e3744fd4b392cdc631c9efe0ce658537070713
Richard Laager <rlaager@pidgin.im>
parents:
19859
diff
changeset
|
821 | |
| 15225 | 822 | int i, count = 1, returned_count; |
| 18233 | 823 | |
| 18739 | 824 | const char **tos, **froms, **urls; |
| 825 | char **subjects; | |
| 18233 | 826 | |
|
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
|
827 | if (type == JABBER_IQ_ERROR) |
| 15225 | 828 | return; |
| 18233 | 829 | |
| 15225 | 830 | child = xmlnode_get_child(packet, "mailbox"); |
| 831 | if (!child) | |
| 832 | return; | |
| 833 | ||
| 834 | in_str = xmlnode_get_attrib(child, "total-matched"); | |
| 18233 | 835 | if (in_str && *in_str) |
| 15225 | 836 | count = atoi(in_str); |
| 18233 | 837 | |
|
20097
f5bef80db09e
applied changes from 19e3744fd4b392cdc631c9efe0ce658537070713
Richard Laager <rlaager@pidgin.im>
parents:
19859
diff
changeset
|
838 | /* 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
|
839 | to = xmlnode_get_attrib(packet, "to"); |
|
f5bef80db09e
applied changes from 19e3744fd4b392cdc631c9efe0ce658537070713
Richard Laager <rlaager@pidgin.im>
parents:
19859
diff
changeset
|
840 | |
|
20114
96e715e155e0
applied changes from 3fcc47961d378fa0cd4eeb00dc6923b16a3a4151
Richard Laager <rlaager@pidgin.im>
parents:
20107
diff
changeset
|
841 | message = xmlnode_get_child(child, "mail-thread-info"); |
| 15225 | 842 | |
|
20114
96e715e155e0
applied changes from 3fcc47961d378fa0cd4eeb00dc6923b16a3a4151
Richard Laager <rlaager@pidgin.im>
parents:
20107
diff
changeset
|
843 | if (count == 0 || !message) { |
|
25746
e97bb5964b19
*** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
23540
diff
changeset
|
844 | if (count > 0) { |
|
e97bb5964b19
*** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
23540
diff
changeset
|
845 | char *bare_jid = jabber_get_bare_jid(to); |
|
e97bb5964b19
*** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
23540
diff
changeset
|
846 | const char *default_tos[2] = { bare_jid }; |
|
e97bb5964b19
*** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
23540
diff
changeset
|
847 | |
|
e97bb5964b19
*** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
23540
diff
changeset
|
848 | 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
|
849 | g_free(bare_jid); |
|
e97bb5964b19
*** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
23540
diff
changeset
|
850 | } else { |
|
e97bb5964b19
*** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
23540
diff
changeset
|
851 | 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
|
852 | } |
|
e97bb5964b19
*** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
23540
diff
changeset
|
853 | |
|
20097
f5bef80db09e
applied changes from 19e3744fd4b392cdc631c9efe0ce658537070713
Richard Laager <rlaager@pidgin.im>
parents:
19859
diff
changeset
|
854 | return; |
|
f5bef80db09e
applied changes from 19e3744fd4b392cdc631c9efe0ce658537070713
Richard Laager <rlaager@pidgin.im>
parents:
19859
diff
changeset
|
855 | } |
| 18233 | 856 | |
| 15225 | 857 | /* Loop once to see how many messages were returned so we can allocate arrays |
| 858 | * accordingly */ | |
| 859 | for (returned_count = 0; message; returned_count++, message=xmlnode_get_next_twin(message)); | |
| 18233 | 860 | |
|
25746
e97bb5964b19
*** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
23540
diff
changeset
|
861 | froms = g_new0(const char* , returned_count + 1); |
|
e97bb5964b19
*** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
23540
diff
changeset
|
862 | tos = g_new0(const char* , returned_count + 1); |
|
e97bb5964b19
*** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
23540
diff
changeset
|
863 | subjects = g_new0(char* , returned_count + 1); |
|
e97bb5964b19
*** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
23540
diff
changeset
|
864 | urls = g_new0(const char* , returned_count + 1); |
| 18233 | 865 | |
| 15225 | 866 | to = xmlnode_get_attrib(packet, "to"); |
| 867 | to_name = jabber_get_bare_jid(to); | |
|
27570
e54277ae75cb
disapproval of revision '0eb69320deac850f1a1eb6ff8ea6c64103095ee8'
Paul Aurich <darkrain42@pidgin.im>
parents:
27506
diff
changeset
|
868 | url = xmlnode_get_attrib(child, "url"); |
|
e54277ae75cb
disapproval of revision '0eb69320deac850f1a1eb6ff8ea6c64103095ee8'
Paul Aurich <darkrain42@pidgin.im>
parents:
27506
diff
changeset
|
869 | if (!url || !*url) |
|
e54277ae75cb
disapproval of revision '0eb69320deac850f1a1eb6ff8ea6c64103095ee8'
Paul Aurich <darkrain42@pidgin.im>
parents:
27506
diff
changeset
|
870 | url = "http://www.gmail.com"; |
| 18233 | 871 | |
| 15225 | 872 | message= xmlnode_get_child(child, "mail-thread-info"); |
| 873 | 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
|
874 | xmlnode *sender_node, *subject_node; |
|
27570
e54277ae75cb
disapproval of revision '0eb69320deac850f1a1eb6ff8ea6c64103095ee8'
Paul Aurich <darkrain42@pidgin.im>
parents:
27506
diff
changeset
|
875 | 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
|
876 | 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
|
877 | |
| 15225 | 878 | subject_node = xmlnode_get_child(message, "subject"); |
| 879 | sender_node = xmlnode_get_child(message, "senders"); | |
| 880 | sender_node = xmlnode_get_child(sender_node, "sender"); | |
| 881 | ||
| 18233 | 882 | while (sender_node && (!xmlnode_get_attrib(sender_node, "unread") || |
| 15225 | 883 | !strcmp(xmlnode_get_attrib(sender_node, "unread"),"0"))) |
| 884 | sender_node = xmlnode_get_next_twin(sender_node); | |
| 18233 | 885 | |
| 15225 | 886 | if (!sender_node) { |
| 887 | i--; | |
| 888 | continue; | |
| 889 | } | |
| 18233 | 890 | |
| 15225 | 891 | from = xmlnode_get_attrib(sender_node, "name"); |
| 892 | if (!from || !*from) | |
| 893 | from = xmlnode_get_attrib(sender_node, "address"); | |
| 894 | subject = xmlnode_get_data(subject_node); | |
| 895 | /* | |
| 896 | * url = xmlnode_get_attrib(message, "url"); | |
| 897 | */ | |
| 898 | tos[i] = (to_name != NULL ? to_name : ""); | |
| 899 | froms[i] = (from != NULL ? from : ""); | |
| 18739 | 900 | subjects[i] = (subject != NULL ? subject : g_strdup("")); |
|
20225
684334efdc19
applied changes from d4b316d73ebaf93803ca2642e78b8821c3b5d5c7
Luke Schierer <lschiere@pidgin.im>
parents:
20209
diff
changeset
|
901 | urls[i] = url; |
| 18233 | 902 | |
| 15225 | 903 | tid = xmlnode_get_attrib(message, "tid"); |
| 18233 | 904 | if (tid && |
| 15225 | 905 | (js->gmail_last_tid == NULL || strcmp(tid, js->gmail_last_tid) > 0)) { |
| 906 | g_free(js->gmail_last_tid); | |
| 907 | js->gmail_last_tid = g_strdup(tid); | |
| 908 | } | |
| 909 | } | |
| 910 | ||
| 18233 | 911 | 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
|
912 | purple_notify_emails(js->gc, count, count == i, (const char**) subjects, froms, tos, |
| 18233 | 913 | urls, NULL, NULL); |
| 15261 | 914 | |
| 15225 | 915 | g_free(to_name); |
| 916 | g_free(tos); | |
| 917 | g_free(froms); | |
|
25746
e97bb5964b19
*** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
23540
diff
changeset
|
918 | for (i = 0; i < returned_count; i++) |
|
e97bb5964b19
*** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
23540
diff
changeset
|
919 | g_free(subjects[i]); |
| 15225 | 920 | g_free(subjects); |
| 921 | g_free(urls); | |
| 922 | ||
| 923 | in_str = xmlnode_get_attrib(child, "result-time"); | |
| 924 | if (in_str && *in_str) { | |
| 925 | g_free(js->gmail_last_time); | |
| 926 | js->gmail_last_time = g_strdup(in_str); | |
| 927 | } | |
| 928 | } | |
| 929 | ||
| 18233 | 930 | void |
|
25817
09d6a40a341d
Pass IQ handlers type, from, id, and the child node
Paul Aurich <darkrain42@pidgin.im>
parents:
25566
diff
changeset
|
931 | 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
|
932 | const char *id, xmlnode *new_mail) |
| 15225 | 933 | { |
| 934 | xmlnode *query; | |
| 935 | JabberIq *iq; | |
| 18233 | 936 | |
| 15225 | 937 | /* bail if the user isn't interested */ |
| 15884 | 938 | if (!purple_account_get_check_mail(js->gc->account)) |
| 15225 | 939 | return; |
| 940 | ||
| 941 | /* 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
|
942 | if (type != JABBER_IQ_SET) |
| 15225 | 943 | return; |
| 944 | ||
|
27062
84edb52aea5b
Ack the mail notification IQ. Refs #8240.
Paul Aurich <darkrain42@pidgin.im>
parents:
26981
diff
changeset
|
945 | /* Acknowledge the notification */ |
|
84edb52aea5b
Ack the mail notification IQ. Refs #8240.
Paul Aurich <darkrain42@pidgin.im>
parents:
26981
diff
changeset
|
946 | 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
|
947 | if (from) |
|
51d62a0b66f9
Avoid an assertion when acking the gmail poke
Paul Aurich <darkrain42@pidgin.im>
parents:
27062
diff
changeset
|
948 | 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
|
949 | xmlnode_set_attrib(iq->node, "id", id); |
|
84edb52aea5b
Ack the mail notification IQ. Refs #8240.
Paul Aurich <darkrain42@pidgin.im>
parents:
26981
diff
changeset
|
950 | jabber_iq_send(iq); |
| 15225 | 951 | |
| 15884 | 952 | purple_debug(PURPLE_DEBUG_MISC, "jabber", |
| 15225 | 953 | "Got new mail notification. Sending request for more info\n"); |
| 954 | ||
| 955 | iq = jabber_iq_new_query(js, JABBER_IQ_GET, "google:mail:notify"); | |
| 956 | jabber_iq_set_callback(iq, jabber_gmail_parse, NULL); | |
| 957 | query = xmlnode_get_child(iq->node, "query"); | |
| 958 | ||
| 959 | if (js->gmail_last_time) | |
| 960 | xmlnode_set_attrib(query, "newer-than-time", js->gmail_last_time); | |
| 961 | if (js->gmail_last_tid) | |
| 962 | xmlnode_set_attrib(query, "newer-than-tid", js->gmail_last_tid); | |
| 963 | ||
| 964 | jabber_iq_send(iq); | |
| 965 | return; | |
| 966 | } | |
| 967 | ||
| 968 | void jabber_gmail_init(JabberStream *js) { | |
| 969 | 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
|
970 | xmlnode *usersetting, *mailnotifications; |
| 15225 | 971 | |
|
27486
f075cba58507
Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <darkrain42@pidgin.im>
parents:
27361
diff
changeset
|
972 | if (!purple_account_get_check_mail(purple_connection_get_account(js->gc))) |
| 15225 | 973 | return; |
| 974 | ||
|
27486
f075cba58507
Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <darkrain42@pidgin.im>
parents:
27361
diff
changeset
|
975 | /* |
|
f075cba58507
Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <darkrain42@pidgin.im>
parents:
27361
diff
changeset
|
976 | * 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
|
977 | * 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
|
978 | * 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
|
979 | * 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
|
980 | * 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
|
981 | */ |
|
f075cba58507
Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <darkrain42@pidgin.im>
parents:
27361
diff
changeset
|
982 | 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
|
983 | 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
|
984 | 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
|
985 | 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
|
986 | 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
|
987 | 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
|
988 | |
| 15225 | 989 | iq = jabber_iq_new_query(js, JABBER_IQ_GET, "google:mail:notify"); |
| 990 | jabber_iq_set_callback(iq, jabber_gmail_parse, NULL); | |
| 991 | jabber_iq_send(iq); | |
| 992 | } | |
| 15265 | 993 | |
| 994 | void jabber_google_roster_init(JabberStream *js) | |
| 995 | { | |
| 996 | JabberIq *iq; | |
| 997 | xmlnode *query; | |
| 998 | ||
| 999 | iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:roster"); | |
| 1000 | query = xmlnode_get_child(iq->node, "query"); | |
| 18233 | 1001 | |
| 15265 | 1002 | xmlnode_set_attrib(query, "xmlns:gr", "google:roster"); |
| 1003 | xmlnode_set_attrib(query, "gr:ext", "2"); | |
| 1004 | ||
| 1005 | jabber_iq_send(iq); | |
| 1006 | } | |
| 1007 | ||
| 1008 | void jabber_google_roster_outgoing(JabberStream *js, xmlnode *query, xmlnode *item) | |
| 1009 | { | |
| 15884 | 1010 | PurpleAccount *account = purple_connection_get_account(js->gc); |
| 15265 | 1011 | GSList *list = account->deny; |
| 1012 | const char *jid = xmlnode_get_attrib(item, "jid"); | |
| 27950 | 1013 | char *jid_norm = (char *)jabber_normalize(account, jid); |
| 15265 | 1014 | |
| 1015 | while (list) { | |
| 1016 | if (!strcmp(jid_norm, (char*)list->data)) { | |
| 1017 | 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
|
1018 | xmlnode_set_attrib(query, "gr:ext", "2"); |
| 15265 | 1019 | xmlnode_set_attrib(item, "gr:t", "B"); |
| 1020 | return; | |
| 1021 | } | |
| 1022 | list = list->next; | |
| 1023 | } | |
| 1024 | } | |
| 1025 | ||
|
15530
9355a1be068e
Make deleting Google Talk buddies work
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
1026 | gboolean jabber_google_roster_incoming(JabberStream *js, xmlnode *item) |
| 15265 | 1027 | { |
| 15884 | 1028 | PurpleAccount *account = purple_connection_get_account(js->gc); |
| 15265 | 1029 | const char *jid = xmlnode_get_attrib(item, "jid"); |
| 1030 | gboolean on_block_list = FALSE; | |
| 1031 | ||
|
20209
c1bbdde1f373
applied changes from 6b5f1f48667171fe73de619dd8f80cacd231a2e2
Luke Schierer <lschiere@pidgin.im>
parents:
20186
diff
changeset
|
1032 | char *jid_norm; |
| 15265 | 1033 | |
| 1034 | 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
|
1035 | const char *subscription = xmlnode_get_attrib(item, "subscription"); |
| 18233 | 1036 | |
| 17327 | 1037 | if (!subscription || !strcmp(subscription, "none")) { |
|
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
|
1038 | /* 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
|
1039 | * 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
|
1040 | */ |
|
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
|
1041 | 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
|
1042 | } |
| 18233 | 1043 | |
|
20209
c1bbdde1f373
applied changes from 6b5f1f48667171fe73de619dd8f80cacd231a2e2
Luke Schierer <lschiere@pidgin.im>
parents:
20186
diff
changeset
|
1044 | jid_norm = g_strdup(jabber_normalize(account, jid)); |
|
c1bbdde1f373
applied changes from 6b5f1f48667171fe73de619dd8f80cacd231a2e2
Luke Schierer <lschiere@pidgin.im>
parents:
20186
diff
changeset
|
1045 | |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27203
diff
changeset
|
1046 | 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
|
1047 | (GCompareFunc)strcmp); |
| 18233 | 1048 | |
|
15530
9355a1be068e
Make deleting Google Talk buddies work
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
1049 | if (grt && (*grt == 'H' || *grt == 'h')) { |
|
27277
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27203
diff
changeset
|
1050 | /* Hidden; don't show this buddy. */ |
|
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27203
diff
changeset
|
1051 | GSList *buddies = purple_find_buddies(account, jid_norm); |
|
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27203
diff
changeset
|
1052 | if (buddies) |
|
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27203
diff
changeset
|
1053 | 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
|
1054 | jid_norm); |
|
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27203
diff
changeset
|
1055 | |
|
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27203
diff
changeset
|
1056 | for ( ; buddies; buddies = g_slist_delete_link(buddies, buddies)) { |
|
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27203
diff
changeset
|
1057 | purple_blist_remove_buddy(buddies->data); |
|
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27203
diff
changeset
|
1058 | } |
|
8a2ecbdd70e4
Various roster cleanups. Refs #7008.
Paul Aurich <darkrain42@pidgin.im>
parents:
27203
diff
changeset
|
1059 | |
| 18739 | 1060 | g_free(jid_norm); |
|
15530
9355a1be068e
Make deleting Google Talk buddies work
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
1061 | return FALSE; |
|
9355a1be068e
Make deleting Google Talk buddies work
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
1062 | } |
| 18233 | 1063 | |
| 15265 | 1064 | if (!on_block_list && (grt && (*grt == 'B' || *grt == 'b'))) { |
| 15884 | 1065 | purple_debug_info("jabber", "Blocking %s\n", jid_norm); |
| 1066 | purple_privacy_deny_add(account, jid_norm, TRUE); | |
| 15265 | 1067 | } else if (on_block_list && (!grt || (*grt != 'B' && *grt != 'b' ))){ |
| 15884 | 1068 | purple_debug_info("jabber", "Unblocking %s\n", jid_norm); |
| 1069 | purple_privacy_deny_remove(account, jid_norm, TRUE); | |
| 15265 | 1070 | } |
| 18739 | 1071 | |
| 1072 | g_free(jid_norm); | |
|
15530
9355a1be068e
Make deleting Google Talk buddies work
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
1073 | return TRUE; |
| 15265 | 1074 | } |
| 1075 | ||
| 18233 | 1076 | void jabber_google_roster_add_deny(PurpleConnection *gc, const char *who) |
| 15265 | 1077 | { |
| 1078 | JabberStream *js; | |
| 1079 | GSList *buddies; | |
| 1080 | JabberIq *iq; | |
| 1081 | xmlnode *query; | |
| 1082 | xmlnode *item; | |
| 1083 | xmlnode *group; | |
| 15884 | 1084 | PurpleBuddy *b; |
| 15265 | 1085 | 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
|
1086 | const char *balias; |
| 15265 | 1087 | |
| 1088 | js = (JabberStream*)(gc->proto_data); | |
| 18233 | 1089 | |
|
27701
d60dcfcb5bfe
keep the compiler happy:
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
27679
diff
changeset
|
1090 | if (!js || !(js->server_caps & JABBER_CAP_GOOGLE_ROSTER)) |
| 15265 | 1091 | return; |
| 1092 | ||
| 1093 | jb = jabber_buddy_find(js, who, TRUE); | |
| 1094 | ||
| 15884 | 1095 | buddies = purple_find_buddies(js->gc->account, who); |
| 15265 | 1096 | if(!buddies) |
| 1097 | return; | |
| 18233 | 1098 | |
| 15265 | 1099 | b = buddies->data; |
| 1100 | ||
| 1101 | iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:roster"); | |
| 18233 | 1102 | |
| 15265 | 1103 | query = xmlnode_get_child(iq->node, "query"); |
| 1104 | item = xmlnode_new_child(query, "item"); | |
| 1105 | ||
| 1106 | while(buddies) { | |
| 15884 | 1107 | PurpleGroup *g; |
| 15265 | 1108 | |
| 1109 | b = buddies->data; | |
| 15884 | 1110 | g = purple_buddy_get_group(b); |
| 15265 | 1111 | |
| 1112 | 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
|
1113 | xmlnode_insert_data(group, purple_group_get_name(g), -1); |
| 18233 | 1114 | |
| 15265 | 1115 | buddies = buddies->next; |
| 1116 | } | |
| 1117 | ||
|
24950
143f594f0cd0
Alias foo. I think blist.h structs are now completely hidden.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24944
diff
changeset
|
1118 | balias = purple_buddy_get_local_buddy_alias(b); |
| 15265 | 1119 | 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
|
1120 | xmlnode_set_attrib(item, "name", balias ? balias : ""); |
| 15265 | 1121 | xmlnode_set_attrib(item, "gr:t", "B"); |
| 1122 | xmlnode_set_attrib(query, "xmlns:gr", "google:roster"); | |
| 1123 | xmlnode_set_attrib(query, "gr:ext", "2"); | |
| 1124 | ||
| 1125 | jabber_iq_send(iq); | |
| 1126 | ||
| 1127 | /* Synthesize a sign-off */ | |
| 1128 | if (jb) { | |
| 1129 | JabberBuddyResource *jbr; | |
| 1130 | GList *l = jb->resources; | |
| 1131 | while (l) { | |
| 1132 | jbr = l->data; | |
|
15346
ef48613b5b9b
[gaim-migrate @ 18074]
Evan Schoenberg <evands@pidgin.im>
parents:
15265
diff
changeset
|
1133 | if (jbr && jbr->name) |
|
ef48613b5b9b
[gaim-migrate @ 18074]
Evan Schoenberg <evands@pidgin.im>
parents:
15265
diff
changeset
|
1134 | { |
| 15884 | 1135 | 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
|
1136 | jabber_buddy_remove_resource(jb, jbr->name); |
|
ef48613b5b9b
[gaim-migrate @ 18074]
Evan Schoenberg <evands@pidgin.im>
parents:
15265
diff
changeset
|
1137 | } |
| 15265 | 1138 | l = l->next; |
| 1139 | } | |
| 1140 | } | |
| 15884 | 1141 | purple_prpl_got_user_status(purple_connection_get_account(gc), who, "offline", NULL); |
| 15265 | 1142 | } |
| 1143 | ||
| 15884 | 1144 | void jabber_google_roster_rem_deny(PurpleConnection *gc, const char *who) |
| 15265 | 1145 | { |
| 1146 | JabberStream *js; | |
| 1147 | GSList *buddies; | |
| 1148 | JabberIq *iq; | |
| 1149 | xmlnode *query; | |
| 1150 | xmlnode *item; | |
| 1151 | xmlnode *group; | |
| 15884 | 1152 | 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
|
1153 | const char *balias; |
| 15265 | 1154 | |
| 1155 | g_return_if_fail(gc != NULL); | |
| 1156 | g_return_if_fail(who != NULL); | |
| 18233 | 1157 | |
| 15265 | 1158 | js = (JabberStream*)(gc->proto_data); |
| 18233 | 1159 | |
|
27701
d60dcfcb5bfe
keep the compiler happy:
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
27679
diff
changeset
|
1160 | if (!js || !(js->server_caps & JABBER_CAP_GOOGLE_ROSTER)) |
| 15265 | 1161 | return; |
| 18233 | 1162 | |
|
24942
ec72b773a9da
More struct hiding work
Richard Laager <rlaager@pidgin.im>
parents:
23540
diff
changeset
|
1163 | buddies = purple_find_buddies(purple_connection_get_account(js->gc), who); |
| 15265 | 1164 | if(!buddies) |
| 1165 | return; | |
| 18233 | 1166 | |
| 15265 | 1167 | b = buddies->data; |
| 1168 | ||
| 1169 | iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:roster"); | |
| 18233 | 1170 | |
| 15265 | 1171 | query = xmlnode_get_child(iq->node, "query"); |
| 1172 | item = xmlnode_new_child(query, "item"); | |
| 1173 | ||
| 1174 | while(buddies) { | |
| 15884 | 1175 | PurpleGroup *g; |
| 15265 | 1176 | |
| 1177 | b = buddies->data; | |
| 15884 | 1178 | g = purple_buddy_get_group(b); |
| 15265 | 1179 | |
| 1180 | 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
|
1181 | xmlnode_insert_data(group, purple_group_get_name(g), -1); |
| 18233 | 1182 | |
| 15265 | 1183 | buddies = buddies->next; |
| 1184 | } | |
| 1185 | ||
|
24950
143f594f0cd0
Alias foo. I think blist.h structs are now completely hidden.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
24944
diff
changeset
|
1186 | balias = purple_buddy_get_local_buddy_alias(b); |
| 15265 | 1187 | 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
|
1188 | xmlnode_set_attrib(item, "name", balias ? balias : ""); |
| 15265 | 1189 | xmlnode_set_attrib(query, "xmlns:gr", "google:roster"); |
| 1190 | xmlnode_set_attrib(query, "gr:ext", "2"); | |
| 1191 | ||
| 1192 | jabber_iq_send(iq); | |
| 1193 | ||
| 1194 | /* See if he's online */ | |
| 1195 | jabber_presence_subscription_set(js, who, "probe"); | |
| 1196 | } | |
|
15587
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1197 | |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1198 | /* 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
|
1199 | * 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
|
1200 | * 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
|
1201 | * 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
|
1202 | * 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
|
1203 | */ |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1204 | 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
|
1205 | { |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1206 | const char *p; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1207 | |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1208 | /* 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
|
1209 | gboolean preceding_space = TRUE; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1210 | |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1211 | 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
|
1212 | gboolean in_tag = FALSE; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1213 | |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1214 | 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
|
1215 | |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1216 | GString *str; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1217 | |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1218 | 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
|
1219 | 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
|
1220 | if (c == '*' && !in_tag) { |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1221 | 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
|
1222 | *(p+1) == '\0' || |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1223 | *(p+1) == '<')) { |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1224 | bold_count++; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1225 | in_bold = FALSE; |
|
16988
1aaf51bf0f23
Patch #265. Fix to Google Talk formatting
Sean Egan <seanegan@pidgin.im>
parents:
15884
diff
changeset
|
1226 | } 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
|
1227 | bold_count++; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1228 | in_bold = TRUE; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1229 | } |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1230 | preceding_space = TRUE; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1231 | } 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
|
1232 | 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
|
1233 | *(p+1) == '\0' || |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1234 | *(p+1) == '<')) { |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1235 | italic_count++; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1236 | in_italic = FALSE; |
|
16988
1aaf51bf0f23
Patch #265. Fix to Google Talk formatting
Sean Egan <seanegan@pidgin.im>
parents:
15884
diff
changeset
|
1237 | } 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
|
1238 | italic_count++; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1239 | in_italic = TRUE; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1240 | } |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1241 | preceding_space = TRUE; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1242 | } 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
|
1243 | in_tag = TRUE; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1244 | } 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
|
1245 | in_tag = FALSE; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1246 | } else if (!in_tag) { |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1247 | 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
|
1248 | preceding_space = TRUE; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1249 | else |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1250 | preceding_space = FALSE; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1251 | } |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1252 | } |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1253 | |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1254 | 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
|
1255 | 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
|
1256 | preceding_space = TRUE; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1257 | |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1258 | 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
|
1259 | gunichar c = g_utf8_get_char(p); |
| 18233 | 1260 | |
|
15587
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1261 | 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
|
1262 | 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
|
1263 | 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
|
1264 | } |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1265 | |
| 18233 | 1266 | |
|
15587
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1267 | if (c == '*' && !in_tag) { |
| 18233 | 1268 | if (in_bold && |
|
15587
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1269 | (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
|
1270 | 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
|
1271 | in_bold = FALSE; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1272 | bold_count--; |
|
16988
1aaf51bf0f23
Patch #265. Fix to Google Talk formatting
Sean Egan <seanegan@pidgin.im>
parents:
15884
diff
changeset
|
1273 | } 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
|
1274 | 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
|
1275 | bold_count--; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1276 | in_bold = TRUE; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1277 | } else { |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1278 | 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
|
1279 | } |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1280 | preceding_space = TRUE; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1281 | } 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
|
1282 | if (in_italic && |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1283 | (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
|
1284 | 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
|
1285 | italic_count--; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1286 | in_italic = FALSE; |
|
16988
1aaf51bf0f23
Patch #265. Fix to Google Talk formatting
Sean Egan <seanegan@pidgin.im>
parents:
15884
diff
changeset
|
1287 | } 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
|
1288 | 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
|
1289 | italic_count--; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1290 | in_italic = TRUE; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1291 | } else { |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1292 | 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
|
1293 | } |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1294 | preceding_space = TRUE; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1295 | } 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
|
1296 | 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
|
1297 | in_tag = TRUE; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1298 | } 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
|
1299 | 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
|
1300 | in_tag = FALSE; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1301 | } else if (!in_tag) { |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1302 | 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
|
1303 | 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
|
1304 | preceding_space = TRUE; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1305 | else |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1306 | preceding_space = FALSE; |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1307 | } else { |
|
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1308 | 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
|
1309 | } |
| 18233 | 1310 | } |
|
15587
cbedd543bfae
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@pidgin.im>
parents:
15530
diff
changeset
|
1311 | 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
|
1312 | } |
|
21195
fd63ef5027d7
Music support for Google Talk
Sean Egan <seanegan@pidgin.im>
parents:
20107
diff
changeset
|
1313 | |
|
fd63ef5027d7
Music support for Google Talk
Sean Egan <seanegan@pidgin.im>
parents:
20107
diff
changeset
|
1314 | 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
|
1315 | { |
|
fd63ef5027d7
Music support for Google Talk
Sean Egan <seanegan@pidgin.im>
parents:
20107
diff
changeset
|
1316 | if (!js->googletalk) |
|
fd63ef5027d7
Music support for Google Talk
Sean Egan <seanegan@pidgin.im>
parents:
20107
diff
changeset
|
1317 | 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
|
1318 | 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
|
1319 | 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
|
1320 | 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
|
1321 | g_free(jbr->status); |
|
21195
fd63ef5027d7
Music support for Google Talk
Sean Egan <seanegan@pidgin.im>
parents:
20107
diff
changeset
|
1322 | jbr->status = NULL; |
|
fd63ef5027d7
Music support for Google Talk
Sean Egan <seanegan@pidgin.im>
parents:
20107
diff
changeset
|
1323 | } else { |
|
fd63ef5027d7
Music support for Google Talk
Sean Egan <seanegan@pidgin.im>
parents:
20107
diff
changeset
|
1324 | 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
|
1325 | } |
|
fd63ef5027d7
Music support for Google Talk
Sean Egan <seanegan@pidgin.im>
parents:
20107
diff
changeset
|
1326 | } |
|
fd63ef5027d7
Music support for Google Talk
Sean Egan <seanegan@pidgin.im>
parents:
20107
diff
changeset
|
1327 | |
|
fd63ef5027d7
Music support for Google Talk
Sean Egan <seanegan@pidgin.im>
parents:
20107
diff
changeset
|
1328 | char *jabber_google_presence_outgoing(PurpleStatus *tune) |
|
fd63ef5027d7
Music support for Google Talk
Sean Egan <seanegan@pidgin.im>
parents:
20107
diff
changeset
|
1329 | { |
|
21714
5956ea2cb4af
don't set the current tune title if it's NULL
Ka-Hing Cheung <khc@pidgin.im>
parents:
21204
diff
changeset
|
1330 | 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
|
1331 | 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
|
1332 | } |
|
26286
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
1333 | |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
1334 | static void |
|
27155
53502d71efdd
Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents:
27089
diff
changeset
|
1335 | 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
|
1336 | 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
|
1337 | { |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
1338 | 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
|
1339 | |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
1340 | 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
|
1341 | 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
|
1342 | error_message); |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
1343 | 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
|
1344 | 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
|
1345 | return; |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
1346 | } |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
1347 | |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
1348 | if (hosts && g_slist_next(hosts)) { |
|
27155
53502d71efdd
Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents:
27089
diff
changeset
|
1349 | 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
|
1350 | 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
|
1351 | int port; |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
1352 | |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
1353 | if (addr->sa_family == AF_INET6) { |
|
27155
53502d71efdd
Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents:
27089
diff
changeset
|
1354 | 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
|
1355 | 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
|
1356 | 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
|
1357 | } else { |
|
27155
53502d71efdd
Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents:
27089
diff
changeset
|
1358 | 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
|
1359 | 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
|
1360 | 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
|
1361 | } |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
1362 | |
|
28318
e02ded498369
jabber: Simplify; js is the callback data and can't be NULL.
Paul Aurich <darkrain42@pidgin.im>
parents:
28317
diff
changeset
|
1363 | 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
|
1364 | 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
|
1365 | 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
|
1366 | 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
|
1367 | |
|
e02ded498369
jabber: Simplify; js is the callback data and can't be NULL.
Paul Aurich <darkrain42@pidgin.im>
parents:
28317
diff
changeset
|
1368 | 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
|
1369 | "%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
|
1370 | |
|
e02ded498369
jabber: Simplify; js is the callback data and can't be NULL.
Paul Aurich <darkrain42@pidgin.im>
parents:
28317
diff
changeset
|
1371 | /* 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
|
1372 | 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
|
1373 | } |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
1374 | |
|
26782
0d61de90ae02
Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <darkrain42@pidgin.im>
parents:
26746
diff
changeset
|
1375 | while (hosts != NULL) { |
|
0d61de90ae02
Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <darkrain42@pidgin.im>
parents:
26746
diff
changeset
|
1376 | 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
|
1377 | /* Free the address */ |
|
0d61de90ae02
Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <darkrain42@pidgin.im>
parents:
26746
diff
changeset
|
1378 | g_free(hosts->data); |
|
0d61de90ae02
Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <darkrain42@pidgin.im>
parents:
26746
diff
changeset
|
1379 | 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
|
1380 | } |
|
26286
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
1381 | } |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
1382 | |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
1383 | static void |
|
26693
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1384 | 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
|
1385 | JabberIqType type, xmlnode *query) |
|
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1386 | { |
|
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1387 | 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
|
1388 | 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
|
1389 | 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
|
1390 | |
|
26693
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1391 | /* |
|
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1392 | * 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
|
1393 | * 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
|
1394 | * 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
|
1395 | */ |
|
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1396 | if (from) { |
|
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1397 | 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
|
1398 | 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
|
1399 | 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
|
1400 | from); |
|
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1401 | g_free(my_bare_jid); |
|
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1402 | return; |
|
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1403 | } |
|
26286
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
1404 | |
|
26693
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1405 | g_free(my_bare_jid); |
|
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1406 | } |
|
26286
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
1407 | |
|
26693
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1408 | 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
|
1409 | return; |
|
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1410 | |
|
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1411 | 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
|
1412 | |
|
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1413 | if (stun) { |
|
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1414 | 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
|
1415 | |
|
26693
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1416 | if (server) { |
|
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1417 | 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
|
1418 | 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
|
1419 | |
|
26693
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1420 | if (host && udp) { |
|
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1421 | int port = atoi(udp); |
|
27155
53502d71efdd
Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents:
27089
diff
changeset
|
1422 | /* 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
|
1423 | cancel it */ |
|
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1424 | if (js->stun_query) |
|
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1425 | 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
|
1426 | |
|
27155
53502d71efdd
Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents:
27089
diff
changeset
|
1427 | 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
|
1428 | 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
|
1429 | } |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
1430 | } |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
1431 | } |
|
28445
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
1432 | |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
1433 | if (relay) { |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
1434 | const xmlnode *token = xmlnode_get_child(relay, "token"); |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
1435 | const xmlnode *server = xmlnode_get_child(relay, "server"); |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
1436 | |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
1437 | if (token) { |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
1438 | 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
|
1439 | |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
1440 | /* 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
|
1441 | 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
|
1442 | } |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
1443 | |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
1444 | if (server) { |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
1445 | js->google_relay_host = |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
1446 | 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
|
1447 | } |
|
c3dbe0b64f44
Some unfinished code to take advantage of Google's relays
Marcus Lundblad <malu@pidgin.im>
parents:
28372
diff
changeset
|
1448 | } |
|
26693
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1449 | } |
|
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1450 | |
|
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1451 | static void |
|
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1452 | 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
|
1453 | JabberIqType type, const char *id, |
|
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1454 | xmlnode *packet, gpointer data) |
|
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1455 | { |
|
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1456 | 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
|
1457 | GOOGLE_JINGLE_INFO_NAMESPACE); |
|
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1458 | |
|
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1459 | if (query) |
|
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1460 | 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
|
1461 | else |
|
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1462 | 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
|
1463 | } |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
1464 | |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
1465 | void |
|
26693
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1466 | 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
|
1467 | JabberIqType type, const char *id, |
|
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1468 | 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
|
1469 | { |
|
26693
0365dcbeaff6
Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <darkrain42@pidgin.im>
parents:
26692
diff
changeset
|
1470 | 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
|
1471 | } |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
1472 | |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
1473 | void |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
1474 | 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
|
1475 | { |
|
27155
53502d71efdd
Remove trailing whitespace that has snuck in.
Paul Aurich <darkrain42@pidgin.im>
parents:
27089
diff
changeset
|
1476 | 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
|
1477 | 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
|
1478 | |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
1479 | 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
|
1480 | NULL); |
|
443041606e32
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <malu@pidgin.im>
parents:
26264
diff
changeset
|
1481 | 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
|
1482 | 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
|
1483 | } |