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
637
Issues
637
List
Boards
Labels
Service Desk
Milestones
Merge Requests
104
Merge Requests
104
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
47cb20ea
Commit
47cb20ea
authored
Feb 20, 2014
by
Mark Andrews
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add EDNS EXPIRE processing on ixfr and axfr out
parent
83eecff7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
61 additions
and
11 deletions
+61
-11
bin/named/client.c
bin/named/client.c
+13
-8
bin/named/include/named/client.h
bin/named/include/named/client.h
+4
-0
bin/named/query.c
bin/named/query.c
+11
-2
bin/named/xfrout.c
bin/named/xfrout.c
+33
-1
No files found.
bin/named/client.c
View file @
47cb20ea
...
...
@@ -249,7 +249,6 @@ allowed(isc_netaddr_t *addr, dns_name_t *signer, dns_acl_t *acl);
static
void
compute_sit
(
ns_client_t
*
client
,
isc_uint32_t
when
,
isc_uint32_t
nonce
,
isc_buffer_t
*
buf
);
#endif
static
inline
isc_result_t
client_addopt
(
ns_client_t
*
client
);
void
ns_client_recursing
(
ns_client_t
*
client
)
{
...
...
@@ -1018,7 +1017,8 @@ client_send(ns_client_t *client) {
* Create an OPT for our reply.
*/
if
((
client
->
attributes
&
NS_CLIENTATTR_WANTOPT
)
!=
0
)
{
result
=
client_addopt
(
client
);
result
=
ns_client_addopt
(
client
,
client
->
message
,
&
client
->
opt
);
if
(
result
!=
ISC_R_SUCCESS
)
goto
done
;
}
...
...
@@ -1377,8 +1377,10 @@ ns_client_error(ns_client_t *client, isc_result_t result) {
ns_client_send
(
client
);
}
static
inline
isc_result_t
client_addopt
(
ns_client_t
*
client
)
{
isc_result_t
ns_client_addopt
(
ns_client_t
*
client
,
dns_message_t
*
message
,
dns_rdataset_t
**
opt
)
{
char
nsid
[
BUFSIZ
],
*
nsidp
;
#ifdef ISC_PLATFORM_USESIT
unsigned
char
sit
[
SIT_SIZE
];
...
...
@@ -1392,7 +1394,9 @@ client_addopt(ns_client_t *client) {
unsigned
int
flags
;
unsigned
char
expire
[
4
];
REQUIRE
(
client
->
opt
==
NULL
);
/* XXXRTH free old. */
REQUIRE
(
NS_CLIENT_VALID
(
client
));
REQUIRE
(
opt
!=
NULL
&&
*
opt
==
NULL
);
REQUIRE
(
message
!=
NULL
);
view
=
client
->
view
;
resolver
=
(
view
!=
NULL
)
?
view
->
resolver
:
NULL
;
...
...
@@ -1456,8 +1460,8 @@ client_addopt(ns_client_t *client) {
count
++
;
}
result
=
dns_message_buildopt
(
client
->
message
,
&
client
->
opt
,
0
,
udpsize
,
flags
,
ednsopts
,
count
);
result
=
dns_message_buildopt
(
message
,
opt
,
0
,
udpsize
,
flags
,
ednsopts
,
count
);
return
(
result
);
}
...
...
@@ -1748,7 +1752,8 @@ process_opt(ns_client_t *client, dns_rdataset_t *opt) {
if
(
client
->
ednsversion
>
0
)
{
isc_stats_increment
(
ns_g_server
->
nsstats
,
dns_nsstatscounter_badednsver
);
result
=
client_addopt
(
client
);
result
=
ns_client_addopt
(
client
,
client
->
message
,
&
client
->
opt
);
if
(
result
==
ISC_R_SUCCESS
)
result
=
DNS_R_BADVERS
;
ns_client_error
(
client
,
result
);
...
...
bin/named/include/named/client.h
View file @
47cb20ea
...
...
@@ -393,4 +393,8 @@ ns_client_isself(dns_view_t *myview, dns_tsigkey_t *mykey,
isc_result_t
ns_client_sourceip
(
dns_clientinfo_t
*
ci
,
isc_sockaddr_t
**
addrp
);
isc_result_t
ns_client_addopt
(
ns_client_t
*
client
,
dns_message_t
*
message
,
dns_rdataset_t
**
opt
);
#endif
/* NAMED_CLIENT_H */
bin/named/query.c
View file @
47cb20ea
...
...
@@ -6073,7 +6073,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
dns_fixedname_t
fixed
;
dns_fixedname_t
wildcardname
;
dns_dbversion_t
*
version
,
*
zversion
;
dns_zone_t
*
zone
;
dns_zone_t
*
zone
,
*
raw
=
NULL
,
*
mayberaw
;
dns_rdata_cname_t
cname
;
dns_rdata_dname_t
dname
;
unsigned
int
options
;
...
...
@@ -7864,10 +7864,17 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
dns_name_equal
(
client
->
query
.
qname
,
dns_rootname
))
client
->
query
.
attributes
&=
~
NS_QUERYATTR_NOADDITIONAL
;
/*
* Return the time to expire for slave zones.
*/
if
(
is_zone
)
dns_zone_getraw
(
zone
,
&
raw
);
mayberaw
=
(
raw
!=
NULL
)
?
raw
:
zone
;
if
(
is_zone
&&
qtype
==
dns_rdatatype_soa
&&
(
client
->
attributes
&
NS_CLIENTATTR_WANTEXPIRE
)
!=
0
&&
client
->
query
.
restarts
==
0
&&
dns_zone_gettype
(
zone
)
==
dns_zone_slave
)
{
dns_zone_gettype
(
mayberaw
)
==
dns_zone_slave
)
{
isc_time_t
expiretime
;
isc_uint32_t
secs
;
dns_zone_getexpiretime
(
zone
,
&
expiretime
);
...
...
@@ -7877,6 +7884,8 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
client
->
expire
=
secs
-
client
->
now
;
}
}
if
(
raw
!=
NULL
)
dns_zone_detach
(
&
raw
);
if
(
dns64
)
{
qtype
=
type
=
dns_rdatatype_aaaa
;
...
...
bin/named/xfrout.c
View file @
47cb20ea
...
...
@@ -729,7 +729,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) {
isc_result_t
result
;
dns_name_t
*
question_name
;
dns_rdataset_t
*
question_rdataset
;
dns_zone_t
*
zone
=
NULL
;
dns_zone_t
*
zone
=
NULL
,
*
raw
=
NULL
,
*
mayberaw
;
dns_db_t
*
db
=
NULL
;
dns_dbversion_t
*
ver
=
NULL
;
dns_rdataclass_t
question_class
;
...
...
@@ -1083,6 +1083,23 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) {
mnemonic
,
(
xfr
->
tsigkey
!=
NULL
)
?
": TSIG "
:
""
,
keyname
,
current_serial
);
dns_zone_getraw
(
zone
,
&
raw
);
mayberaw
=
(
raw
!=
NULL
)
?
raw
:
zone
;
if
((
client
->
attributes
&
NS_CLIENTATTR_WANTEXPIRE
)
!=
0
&&
dns_zone_gettype
(
mayberaw
)
==
dns_zone_slave
)
{
isc_time_t
expiretime
;
isc_uint32_t
secs
;
dns_zone_getexpiretime
(
zone
,
&
expiretime
);
secs
=
isc_time_seconds
(
&
expiretime
);
if
(
secs
>=
client
->
now
&&
result
==
ISC_R_SUCCESS
)
{
client
->
attributes
|=
NS_CLIENTATTR_HAVEEXPIRE
;
client
->
expire
=
secs
-
client
->
now
;
}
}
if
(
raw
!=
NULL
)
dns_zone_detach
(
&
raw
);
/*
* Hand the context over to sendstream(). Set xfr to NULL;
* sendstream() is responsible for either passing the
...
...
@@ -1292,6 +1309,21 @@ sendstream(xfrout_ctx_t *xfr) {
if
(
xfr
->
lasttsig
!=
NULL
)
isc_buffer_free
(
&
xfr
->
lasttsig
);
/*
* Add a EDNS option to the message?
*/
if
((
xfr
->
client
->
attributes
&
NS_CLIENTATTR_WANTOPT
)
!=
0
)
{
dns_rdataset_t
*
opt
=
NULL
;
CHECK
(
ns_client_addopt
(
xfr
->
client
,
msg
,
&
opt
));
CHECK
(
dns_message_setopt
(
msg
,
opt
));
/*
* Add to first message only.
*/
xfr
->
client
->
attributes
&=
~
NS_CLIENTATTR_WANTNSID
;
xfr
->
client
->
attributes
&=
~
NS_CLIENTATTR_HAVEEXPIRE
;
}
/*
* Account for reserved space.
*/
...
...
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