Mercurial > pidgin.yaz

comparison libpurple/protocols/jabber/jabber.c @ 30926:196e4c5b2043

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some unfinished code to take advantage of Google's relays
author Marcus Lundblad <ml@update.uu.se>
date Mon, 31 Aug 2009 20:23:51 +0000
parents b357216b7b79
children c3b32b027d9d b689be519aa6
comparison
equal deleted inserted replaced
28516:087ad09cd4f5 30926:196e4c5b2043
840 js->protocol_version = JABBER_PROTO_1_0; 840 js->protocol_version = JABBER_PROTO_1_0;
841 js->sessions = NULL; 841 js->sessions = NULL;
842 js->stun_ip = NULL; 842 js->stun_ip = NULL;
843 js->stun_port = 0; 843 js->stun_port = 0;
844 js->stun_query = NULL; 844 js->stun_query = NULL;
845 js->google_relay_token = NULL;
846 js->google_relay_host = NULL;
847 js->google_relay_request = NULL;
845 848
846 /* if we are idle, set idle-ness on the stream (this could happen if we get 849 /* if we are idle, set idle-ness on the stream (this could happen if we get
847 disconnected and the reconnects while being idle. I don't think it makes 850 disconnected and the reconnects while being idle. I don't think it makes
848 sense to do this when registering a new account... */ 851 sense to do this when registering a new account... */
849 presence = purple_account_get_presence(account); 852 presence = purple_account_get_presence(account);
1559 1562
1560 /* cancel DNS query for STUN, if one is ongoing */ 1563 /* cancel DNS query for STUN, if one is ongoing */
1561 if (js->stun_query) { 1564 if (js->stun_query) {
1562 purple_dnsquery_destroy(js->stun_query); 1565 purple_dnsquery_destroy(js->stun_query);
1563 js->stun_query = NULL; 1566 js->stun_query = NULL;
1567 }
1568
1569 /* remove Google relay-related stuff */
1570 g_free(js->google_relay_token);
1571 g_free(js->google_relay_host);
1572
1573 if (js->google_relay_request != NULL) {
1574 purple_util_fetch_url_cancel(js->google_relay_request);
1575 js->google_relay_request = NULL;
1564 } 1576 }
1565 1577
1566 g_free(js); 1578 g_free(js);
1567 1579
1568 gc->proto_data = NULL; 1580 gc->proto_data = NULL;
3019 3031
3020 jb = jabber_buddy_find(js, who, FALSE); 3032 jb = jabber_buddy_find(js, who, FALSE);
3021 jbr = jabber_buddy_find_resource(jb, resource); 3033 jbr = jabber_buddy_find_resource(jb, resource);
3022 g_free(resource); 3034 g_free(resource);
3023 3035
3036 /*
3037 return jabber_google_session_initiate(js, who, type);
3038 */
3024 if (type & PURPLE_MEDIA_AUDIO && 3039 if (type & PURPLE_MEDIA_AUDIO &&
3025 !jabber_resource_has_capability(jbr, 3040 !jabber_resource_has_capability(jbr,
3026 JINGLE_APP_RTP_SUPPORT_AUDIO) && 3041 JINGLE_APP_RTP_SUPPORT_AUDIO) &&
3027 jabber_resource_has_capability(jbr, 3042 jabber_resource_has_capability(jbr,
3028 GOOGLE_VOICE_CAP)) 3043 GOOGLE_VOICE_CAP))