pidgin: e8dfc4f6: Clean up SRV/TXT query functions.
qulogic at pidgin.im
qulogic at pidgin.im
Fri Sep 2 00:39:34 EDT 2011
----------------------------------------------------------------------
Revision: e8dfc4f66bd217f94ae0e7240121ffa5ccf7d4e4
Parent: 5bee1fe926f6fb7ca6e12680dc4c95634865b6c0
Author: qulogic at pidgin.im
Date: 09/01/11 23:18:15
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e8dfc4f66bd217f94ae0e7240121ffa5ccf7d4e4
Changelog:
Clean up SRV/TXT query functions.
* Rename _account functions to their regular form.
* Remove the unnecessary _cancel functions.
Changes against parent 5bee1fe926f6fb7ca6e12680dc4c95634865b6c0
patched ChangeLog.API
patched libpurple/dnssrv.c
patched libpurple/dnssrv.h
patched libpurple/protocols/jabber/disco.c
patched libpurple/protocols/jabber/jabber.c
patched libpurple/protocols/simple/simple.c
patched libpurple/stun.c
-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.c aa22aa1a5a26946b75f27bc4c539d62ee8013345
+++ libpurple/protocols/jabber/jabber.c 6de2577bb36ea690c14ff63ab7ffe9b2f6851974
@@ -813,7 +813,7 @@ jabber_login_callback(gpointer data, gin
try_srv_connect(js);
} else {
purple_debug_info("jabber","Couldn't connect directly to %s. Trying to find alternative connection methods, like BOSH.\n", js->user->domain);
- js->srv_query_data = purple_txt_resolve_account(
+ js->srv_query_data = purple_txt_resolve(
purple_connection_get_account(gc), "_xmppconnect",
js->user->domain, txt_resolved_cb, js);
}
@@ -1074,7 +1074,7 @@ jabber_stream_connect(JabberStream *js)
jabber_login_connect(js, js->user->domain, connect_server,
purple_account_get_int(account, "port", 5222), TRUE);
} else {
- js->srv_query_data = purple_srv_resolve_account(account, "xmpp-client",
+ js->srv_query_data = purple_srv_resolve(account, "xmpp-client",
"tcp", js->user->domain, srv_resolved_cb, js);
}
}
@@ -1599,7 +1599,7 @@ void jabber_close(PurpleConnection *gc)
jabber_send_raw(js, "</stream:stream>", -1);
if (js->srv_query_data)
- purple_srv_cancel(js->srv_query_data);
+ purple_srv_txt_query_destroy(js->srv_query_data);
if(js->gsc) {
purple_ssl_close(js->gsc);
============================================================
--- libpurple/protocols/jabber/disco.c 7376b06c23614d87cee5bf4d5616472751bd7221
+++ libpurple/protocols/jabber/disco.c a5e79029861b00a72571ec0283c7e238f10a56c0
@@ -550,7 +550,7 @@ jabber_disco_server_info_result_cb(Jabbe
} else if (purple_network_get_stun_ip() == NULL ||
purple_strequal(purple_network_get_stun_ip(), "")) {
js->srv_query_data =
- purple_srv_resolve_account(
+ purple_srv_resolve(
purple_connection_get_account(js->gc), "stun", "udp",
js->user->domain,
jabber_disco_stun_srv_resolve_cb, js);
============================================================
--- ChangeLog.API c977b930fd6cb2becd44267131437e20d06056ee
+++ ChangeLog.API c5ad3db382d2a32d17e5d9a02862b3eb2bfadcc6
@@ -62,6 +62,8 @@ version 3.0.0 (??/??/????):
* PurpleConnectionUiOps.report_disconnect now passes a
PurpleConnectionError as the second parameter
* purple_dnsquery_a now takes a PurpleAccount as the first parameter
+ * purple_srv_resolve now takes a PurpleAccount as the first parameter
+ * purple_txt_resolve now takes a PurpleAccount as the first parameter
Removed:
* _GntFileType
@@ -104,10 +106,14 @@ version 3.0.0 (??/??/????):
* purple_notify_searchresults_get_columns_count
* purple_notify_searchresults_get_rows_count
* purple_notify_searchresults_row_get
+ * purple_srv_cancel
+ * purple_srv_resolve_account
* purple_status_type_get_primary_attr
* purple_status_type_set_primary_attr
* purple_strlcat
* purple_strlcpy
+ * purple_txt_cancel
+ * purple_txt_resolve_account
* purple_util_fetch_url_request_len_with_account. Use
purple_util_fetch_url_request_len, instead.
* PurpleConnectionUiOps.report_disconnect_reason
============================================================
--- libpurple/protocols/simple/simple.c ca4a0a4a60d33f417d171c12befa4022643d3cdb
+++ libpurple/protocols/simple/simple.c a9576a271cf36417576e4cb54632ecf583b741d0
@@ -1970,7 +1970,7 @@ static void simple_login(PurpleAccount *
hosttoconnect = purple_account_get_string(account, "proxy", sip->servername);
}
- sip->srv_query_data = purple_srv_resolve_account(account, "sip",
+ sip->srv_query_data = purple_srv_resolve(account, "sip",
sip->udp ? "udp" : "tcp", hosttoconnect, srvresolved, sip);
}
@@ -2007,7 +2007,7 @@ static void simple_close(PurpleConnectio
purple_dnsquery_destroy(sip->query_data);
if (sip->srv_query_data != NULL)
- purple_srv_cancel(sip->srv_query_data);
+ purple_srv_txt_query_destroy(sip->srv_query_data);
if (sip->listen_data != NULL)
purple_network_listen_cancel(sip->listen_data);
============================================================
--- libpurple/stun.c d61f5ade42b3420270ecb68d82c075de15c51ff0
+++ libpurple/stun.c ca2a68abc1c32262b1ba9f166b313057ce35f031
@@ -424,7 +424,7 @@ PurpleStunNatDiscovery *purple_stun_disc
nattype.servername = g_strdup(servername);
callbacks = g_slist_append(callbacks, cb);
- purple_srv_resolve_account(NULL, "stun", "udp", servername, do_test1,
+ purple_srv_resolve(NULL, "stun", "udp", servername, do_test1,
(gpointer) servername);
return &nattype;
============================================================
--- libpurple/dnssrv.c 01fb6d6cae9c7671c89b1df6a3598159342ba0f9
+++ libpurple/dnssrv.c e57cc009c50cd3044064ed71b5e7a380219723fc
@@ -725,15 +725,7 @@ PurpleSrvTxtQueryData *
#endif
PurpleSrvTxtQueryData *
-purple_srv_resolve(const char *protocol, const char *transport,
- const char *domain, PurpleSrvCallback cb, gpointer extradata)
-{
- return purple_srv_resolve_account(NULL, protocol, transport, domain,
- cb, extradata);
-}
-
-PurpleSrvTxtQueryData *
-purple_srv_resolve_account(PurpleAccount *account, const char *protocol,
+purple_srv_resolve(PurpleAccount *account, const char *protocol,
const char *transport, const char *domain, PurpleSrvCallback cb,
gpointer extradata)
{
@@ -869,13 +861,7 @@ purple_srv_resolve_account(PurpleAccount
#endif
}
-PurpleSrvTxtQueryData *purple_txt_resolve(const char *owner,
- const char *domain, PurpleTxtCallback cb, gpointer extradata)
-{
- return purple_txt_resolve_account(NULL, owner, domain, cb, extradata);
-}
-
-PurpleSrvTxtQueryData *purple_txt_resolve_account(PurpleAccount *account,
+PurpleSrvTxtQueryData *purple_txt_resolve(PurpleAccount *account,
const char *owner, const char *domain, PurpleTxtCallback cb,
gpointer extradata)
{
@@ -1006,18 +992,6 @@ PurpleSrvTxtQueryData *purple_txt_resolv
#endif
}
-void
-purple_txt_cancel(PurpleSrvTxtQueryData *query_data)
-{
- purple_srv_txt_query_destroy(query_data);
-}
-
-void
-purple_srv_cancel(PurpleSrvTxtQueryData *query_data)
-{
- purple_srv_txt_query_destroy(query_data);
-}
-
const gchar *
purple_txt_response_get_content(PurpleTxtResponse *resp)
{
============================================================
--- libpurple/dnssrv.h d510de4d1637f436682f0cd146c67160e68f0837
+++ libpurple/dnssrv.h e8e97f5c1dd4f69e9c6ec9c905ef6952863966d7
@@ -99,86 +99,40 @@ typedef void (*PurpleTxtCallback)(GList
/**
* Queries an SRV record.
*
- * @param account the account that the query is being done for (or NULL)
- * @param protocol Name of the protocol (e.g. "sip")
+ * @param account The account that the query is being done for (or NULL)
+ * @param protocol Name of the protocol (e.g. "sip")
* @param transport Name of the transport ("tcp" or "udp")
- * @param domain Domain name to query (e.g. "blubb.com")
- * @param cb A callback which will be called with the results
+ * @param domain Domain name to query (e.g. "blubb.com")
+ * @param cb A callback which will be called with the results
* @param extradata Extra data to be passed to the callback
*
- * @since 2.8.0
+ * @return NULL if there was an error, otherwise return a reference to
+ * a data structure that can be used to cancel the pending
+ * DNS query, if needed.
*/
-PurpleSrvTxtQueryData *purple_srv_resolve_account(PurpleAccount *account, const char *protocol, const char *transport, const char *domain, PurpleSrvCallback cb, gpointer extradata);
+PurpleSrvTxtQueryData *purple_srv_resolve(PurpleAccount *account, const char *protocol, const char *transport, const char *domain, PurpleSrvCallback cb, gpointer extradata);
-#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_DNSSRV_C_)
/**
- * Queries an SRV record.
- *
- * @param protocol Name of the protocol (e.g. "sip")
- * @param transport Name of the transport ("tcp" or "udp")
- * @param domain Domain name to query (e.g. "blubb.com")
- * @param cb A callback which will be called with the results
- * @param extradata Extra data to be passed to the callback
- *
- * @deprecated Use purple_srv_resolve_account instead
- */
-PurpleSrvTxtQueryData *purple_srv_resolve(const char *protocol, const char *transport, const char *domain, PurpleSrvCallback cb, gpointer extradata);
-#endif
-
-/**
- * Cancel an SRV or DNS query.
- *
- * @param query_data The request to cancel.
- *
- * @deprecated Use purple_srv_txt_query_destroy instead
- */
-void purple_srv_cancel(PurpleSrvTxtQueryData *query_data);
-
-/**
* Queries an TXT record.
*
- * @param account the account that the query is being done for (or NULL)
- * @param owner Name of the protocol (e.g. "_xmppconnect")
- * @param domain Domain name to query (e.g. "blubb.com")
- * @param cb A callback which will be called with the results
+ * @param account The account that the query is being done for (or NULL)
+ * @param owner Name of the protocol (e.g. "_xmppconnect")
+ * @param domain Domain name to query (e.g. "blubb.com")
+ * @param cb A callback which will be called with the results
* @param extradata Extra data to be passed to the callback
*
- * @since 2.8.0
+ * @return NULL if there was an error, otherwise return a reference to
+ * a data structure that can be used to cancel the pending
+ * DNS query, if needed.
*/
-PurpleSrvTxtQueryData *purple_txt_resolve_account(PurpleAccount *account, const char *owner, const char *domain, PurpleTxtCallback cb, gpointer extradata);
+PurpleSrvTxtQueryData *purple_txt_resolve(PurpleAccount *account, const char *owner, const char *domain, PurpleTxtCallback cb, gpointer extradata);
-#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_DNSSRV_C_)
/**
- * Queries an TXT record.
- *
- * @param owner Name of the protocol (e.g. "_xmppconnect")
- * @param domain Domain name to query (e.g. "blubb.com")
- * @param cb A callback which will be called with the results
- * @param extradata Extra data to be passed to the callback
- *
- * @deprecated Use purple_txt_resolve_account instead
- *
- * @since 2.6.0
- */
-PurpleSrvTxtQueryData *purple_txt_resolve(const char *owner, const char *domain, PurpleTxtCallback cb, gpointer extradata);
-#endif
-
-/**
- * Cancel an TXT DNS query.
- *
- * @param query_data The request to cancel.
- * @since 2.6.0
- *
- * @deprecated Use purple_srv_txt_query_destroy instead
- */
-void purple_txt_cancel(PurpleSrvTxtQueryData *query_data);
-
-/**
* Get the value of the current TXT record.
*
* @param response The TXT response record
- * @returns The value of the current TXT record.
- * @since 2.6.0
+ *
+ * @return The value of the current TXT record.
*/
const gchar *purple_txt_response_get_content(PurpleTxtResponse *response);
@@ -186,7 +140,6 @@ const gchar *purple_txt_response_get_con
* Destroy a TXT DNS response object.
*
* @param response The PurpleTxtResponse to destroy.
- * @since 2.6.0
*/
void purple_txt_response_destroy(PurpleTxtResponse *response);
@@ -216,7 +169,7 @@ PurpleSrvTxtQueryUiOps *purple_srv_txt_q
PurpleSrvTxtQueryUiOps *purple_srv_txt_query_get_ui_ops(void);
/**
- * Get the query from a PurpleDnsQueryData
+ * Get the query from a PurpleSrvTxtQueryData
*
* @param query_data The SRV/TXT query
* @return The query.
@@ -224,7 +177,7 @@ char *purple_srv_txt_query_get_query(Pur
char *purple_srv_txt_query_get_query(PurpleSrvTxtQueryData *query_data);
/**
- * Get the type from a PurpleDnsQueryData (TXT or SRV)
+ * Get the type from a PurpleSrvTxtQueryData (TXT or SRV)
*
* @param query_data The query
* @return The query.
@@ -236,3 +189,4 @@ int purple_srv_txt_query_get_type(Purple
#endif
#endif /* _PURPLE_DNSSRV_H */
+
More information about the Commits
mailing list