Author: file
Date: Tue Mar 10 14:17:48 2015
New Revision: 432717

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=432717
Log:
dns: Remove the timer identifier in the scheduled callback, not later.

Modified:
    team/group/dns/main/dns_core.c

Modified: team/group/dns/main/dns_core.c
URL: 
http://svnview.digium.com/svn/asterisk/team/group/dns/main/dns_core.c?view=diff&rev=432717&r1=432716&r2=432717
==============================================================================
--- team/group/dns/main/dns_core.c (original)
+++ team/group/dns/main/dns_core.c Tue Mar 10 14:17:48 2015
@@ -517,6 +517,7 @@
        struct ast_dns_query_recurring *recurring = (struct 
ast_dns_query_recurring *)data;
 
        ao2_lock(recurring);
+       recurring->timer = -1;
        if (!recurring->cancelled) {
                recurring->query = ast_dns_resolve_async(recurring->name, 
recurring->rr_type, recurring->rr_class, 
dns_query_recurring_resolution_callback,
                        recurring);
@@ -538,8 +539,6 @@
        recurring->callback(query);
 
        ao2_lock(recurring);
-       recurring->timer = -1;
-
        /* So.. if something has not externally cancelled this we can 
reschedule based on the TTL */
        if (!recurring->cancelled) {
                int ttl = dns_query_recurring_get_ttl(query);


-- 
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

svn-commits mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/svn-commits

Reply via email to