Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
BIND
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
579
Issues
579
List
Boards
Labels
Service Desk
Milestones
Merge Requests
111
Merge Requests
111
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ISC Open Source Projects
BIND
Commits
bf64a0d5
Commit
bf64a0d5
authored
Apr 23, 2008
by
Tatuya JINMEI 神明達哉
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2361. [bug] "recursion" statistics counter could be counted
multiple times for a single query. [RT #17990]
parent
5f23979a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
7 deletions
+17
-7
CHANGES
CHANGES
+3
-0
bin/named/query.c
bin/named/query.c
+14
-7
No files found.
CHANGES
View file @
bf64a0d5
2361. [bug] "recursion" statistics counter could be counted
multiple times for a single query. [RT #17990]
2360. [bug] Fix a condition where we release a database version
(which may acquire a lock) while holding the lock.
...
...
bin/named/query.c
View file @
bf64a0d5
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: query.c,v 1.30
5 2008/04/03 05:55:51 marka
Exp $ */
/* $Id: query.c,v 1.30
6 2008/04/23 01:14:24 jinmei
Exp $ */
/*! \file */
...
...
@@ -2941,13 +2941,14 @@ query_resume(isc_task_t *task, isc_event_t *event) {
static
isc_result_t
query_recurse
(
ns_client_t
*
client
,
dns_rdatatype_t
qtype
,
dns_name_t
*
qdomain
,
dns_rdataset_t
*
nameservers
)
dns_rdataset_t
*
nameservers
,
isc_boolean_t
resuming
)
{
isc_result_t
result
;
dns_rdataset_t
*
rdataset
,
*
sigrdataset
;
isc_sockaddr_t
*
peeraddr
;
inc_stats
(
client
,
dns_nsstatscounter_recursion
);
if
(
!
resuming
)
inc_stats
(
client
,
dns_nsstatscounter_recursion
);
/*
* We are about to recurse, which means that this client will
...
...
@@ -3352,6 +3353,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
unsigned
int
options
;
isc_boolean_t
empty_wild
;
dns_rdataset_t
*
noqname
;
isc_boolean_t
resuming
;
CTRACE
(
"query_find"
);
...
...
@@ -3377,6 +3379,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
need_wildcardproof
=
ISC_FALSE
;
empty_wild
=
ISC_FALSE
;
options
=
0
;
resuming
=
ISC_FALSE
;
if
(
event
!=
NULL
)
{
/*
...
...
@@ -3419,6 +3422,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
}
result
=
event
->
result
;
resuming
=
ISC_TRUE
;
goto
resume
;
}
...
...
@@ -3624,7 +3628,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
*/
if
(
RECURSIONOK
(
client
))
{
result
=
query_recurse
(
client
,
qtype
,
NULL
,
NULL
);
NULL
,
NULL
,
resuming
);
if
(
result
==
ISC_R_SUCCESS
)
client
->
query
.
attributes
|=
NS_QUERYATTR_RECURSING
;
...
...
@@ -3795,10 +3799,12 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
*/
if
(
dns_rdatatype_atparent
(
type
))
result
=
query_recurse
(
client
,
qtype
,
NULL
,
NULL
);
NULL
,
NULL
,
resuming
);
else
result
=
query_recurse
(
client
,
qtype
,
fname
,
rdataset
);
fname
,
rdataset
,
resuming
);
if
(
result
==
ISC_R_SUCCESS
)
client
->
query
.
attributes
|=
NS_QUERYATTR_RECURSING
;
...
...
@@ -4251,7 +4257,8 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
result
=
query_recurse
(
client
,
qtype
,
NULL
,
NULL
);
NULL
,
resuming
);
if
(
result
==
ISC_R_SUCCESS
)
client
->
query
.
attributes
|=
NS_QUERYATTR_RECURSING
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment