kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

dns: Make query sets hold on to queries for their lifetime.

Browse Source 
The query set documentation states that upon completion queries can be
retrieved for the lifetime of the query set. This is a reasonable
expectation but does not currently occur. This was originally done
to resolve a circular reference between queries and query sets, but
in practice the query can be kept.

This change makes it so a query does not have a reference to the
query set until it begins resolving. It also makes it so that the
reference is given up upon the query being completed. This allows
the queries to remain for the lifetime of the query set. As the
query set on the query is only useful to the query set functionality
and only for the lifetime that the query is resolving this is safe
to do.

ASTERISK-24994 #close
Reported by: Joshua Colp

Change-Id: I54e09c0cb45475896654e7835394524e816d1aa0
This commit is contained in:
Joshua Colp
2015-04-22 13:28:09 -03:00
parent 46950d6901
commit 7216e3c608
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/test_dns_query_set.c
View File

@@ -131,9 +131,14 @@ static int query_set_resolve(struct ast_dns_query *query)
static int query_set_cancel(struct ast_dns_query *query)
{
struct ast_dns_query_set *query_set = ast_dns_query_get_data(query);
struct query_set_data *qsdata = query_set->user_data;
struct query_set_data *qsdata;
int res = -1;
if (!query_set) {
return -1;
}
qsdata = query_set->user_data;
if (qsdata->cancel++ < qsdata->cancel_allowed) {
res = 0;
}