upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-21 09:26:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Remove rrset-order cyclic from the default config, with shim

Browse source 
Currently we add an rrset-order cyclic statement to the default config.
Since the rrset-order allows matching a subset of all names, it must
be implemented with a string comparison against a wildcard, and since
the statement applies per rrset, this can result in millions of
comparisons per second on a busy authoritative server.

This commit removes rrset-order from the default config, but adds back
a code shim in query_setorder to preserve the previous behaviour.
This commit is contained in:
Alessio Podda 2025-12-23 16:38:53 +01:00
parent 76e23a7945
commit 78588981df
3 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/include/defaultconfig.h
View file

@ -79,7 +79,7 @@ options {\n\
request-zoneversion false;\n\
resolver-query-timeout 10;\n\
# responselog <boolean>;\n\
rrset-order { order cyclic; };\n\
# rrset-order { order cyclic; };\n\
secroots-file \"named.secroots\";\n\
send-cookie true;\n\
serial-query-rate 20;\n\

29
bin/named/server.c
View file

@ -4620,20 +4620,27 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
* Configure the views rrset-order.
*/
{
const cfg_obj_t *rrsetorder = NULL;
(void)named_config_get(maps, "rrset-order", &rrsetorder);
dns_order_create(mctx, &order);
CFG_LIST_FOREACH(rrsetorder, element) {
const cfg_obj_t *ent = cfg_listelt_value(element);
CHECK(configure_order(order, ent));
}
/*
* Detach the old order
*/
if (view->order != NULL) {
dns_order_detach(&view->order);
}
dns_order_attach(order, &view->order);
dns_order_detach(&order);
const cfg_obj_t *rrsetorder = NULL;
if (ISC_R_SUCCESS ==
named_config_get(maps, "rrset-order", &rrsetorder))
{
dns_order_create(mctx, &order);
CFG_LIST_FOREACH(rrsetorder, element) {
const cfg_obj_t *ent =
cfg_listelt_value(element);
CHECK(configure_order(order, ent));
}
dns_order_attach(order, &view->order);
dns_order_detach(&order);
}
}
/*
* Copy the aclenv object.

9
lib/ns/query.c
View file

@ -2212,6 +2212,15 @@ query_setorder(query_ctx_t *qctx, dns_name_t *name, dns_rdataset_t *rdataset) {
if (order != NULL) {
rdataset->attributes.order = dns_order_find(
order, name, rdataset->type, rdataset->rdclass);
} else {
/*
* For backward compatibility reasons, we need to behave as if
* rrset-order: cyclic was set when no order is configured.
*
* This was done through the default config, but it came at a
* speed penalty.
*/
rdataset->attributes.order = dns_order_cyclic;
}
}