upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2026-02-11 23:05:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix issue #825: interaction between ECS and serve-expired.

Browse source
This commit is contained in:
Philip Homburg 2023-01-31 15:16:38 +01:00
parent 24e6d1e18e
commit fb06364014
3 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
edns-subnet/subnetmod.c
View file

@ -779,6 +779,11 @@ subnetmod_operate(struct module_qstate *qstate, enum module_ev event,
&qstate->mesh_info->reply_list->query_reply.client_addr,
&sq->ecs_client_in, qstate->env->cfg);
}
else if(qstate->client_addr.ss_family != AF_UNSPEC) {
subnet_option_from_ss(
&qstate->client_addr,
&sq->ecs_client_in, qstate->env->cfg);
}
if(sq->ecs_client_in.subnet_validdata == 0) {
/* No clients are interested in result or we could not

18
services/mesh.c
View file

@ -803,20 +803,10 @@ static void mesh_schedule_prefetch_subnet(struct mesh_area* mesh,
return;
}
} else {
/* Fake the ECS data from the client's IP */
struct ecs_data ecs;
memset(&ecs, 0, sizeof(ecs));
subnet_option_from_ss(&rep->client_addr, &ecs, mesh->env->cfg);
if(ecs.subnet_validdata == 0) {
log_err("prefetch_subnet subnet_option_from_ss: invalid data");
return;
}
subnet_ecs_opt_list_append(&ecs, &s->s.edns_opts_front_in,
&s->s, s->s.region);
if(!s->s.edns_opts_front_in) {
log_err("prefetch_subnet subnet_ecs_opt_list_append: out of memory");
return;
}
/* Store the client's address. Later in the subnet module,
* it is decided whether to include an ECS option or not.
*/
s->s.client_addr = rep->client_addr;
}
#ifdef UNBOUND_DEBUG
n =

4
util/module.h
View file

@ -619,6 +619,10 @@ struct module_qstate {
/** if this is a validation recursion query that does not get
* validation itself */
int is_valrec;
/** client network address is needed for the client-subnet option
* when probing, but we want use reply_list in mesh_info, because
* we don't want to send a reply. */
struct sockaddr_storage client_addr;
/** comm_reply contains server replies */
struct comm_reply* reply;