diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2022-10-16 19:24:20 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2022-10-16 19:24:20 +0000 |
| commit | 643f9a0581e8aac7eb790ced1164748939829826 (patch) | |
| tree | 426d366252d838c8c61b439342ab32eccd181425 /services/mesh.c | |
| parent | 0dde6f4f8e604df8c6fbdab8b4aadb5ddf80c76f (diff) | |
| download | src-643f9a0581e8aac7eb790ced1164748939829826.tar.gz src-643f9a0581e8aac7eb790ced1164748939829826.zip | |
unbound: Vendor import 1.16.3vendor/unbound/1.17.0
Added ACL per interface, proxy protocol and bug fixes.
Announcement: https://nlnetlabs.nl/news/2022/Oct/13/unbound-1.17.0-released/
Diffstat (limited to 'services/mesh.c')
| -rw-r--r-- | services/mesh.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/services/mesh.c b/services/mesh.c index 2a411942663d..9007b6e08c32 100644 --- a/services/mesh.c +++ b/services/mesh.c @@ -806,7 +806,7 @@ static void mesh_schedule_prefetch_subnet(struct mesh_area* mesh, /* Fake the ECS data from the client's IP */ struct ecs_data ecs; memset(&ecs, 0, sizeof(ecs)); - subnet_option_from_ss(&rep->addr, &ecs, mesh->env->cfg); + 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; @@ -1488,8 +1488,9 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep, } /* Log reply sent */ if(m->s.env->cfg->log_replies) { - log_reply_info(NO_VERBOSE, &m->s.qinfo, &r->query_reply.addr, - r->query_reply.addrlen, duration, 0, r_buffer); + log_reply_info(NO_VERBOSE, &m->s.qinfo, + &r->query_reply.client_addr, + r->query_reply.client_addrlen, duration, 0, r_buffer); } } @@ -1530,7 +1531,8 @@ void mesh_query_done(struct mesh_state* mstate) respip_inform_print(mstate->s.respip_action_info, r->qname, mstate->s.qinfo.qtype, mstate->s.qinfo.qclass, r->local_alias, - &r->query_reply); + &r->query_reply.client_addr, + r->query_reply.client_addrlen); if(mstate->s.env->cfg->stat_extended && mstate->s.respip_action_info->rpz_used) { if(mstate->s.respip_action_info->rpz_disabled) @@ -2180,7 +2182,8 @@ mesh_serve_expired_callback(void* arg) if(actinfo.addrinfo) { respip_inform_print(&actinfo, r->qname, qstate->qinfo.qtype, qstate->qinfo.qclass, - r->local_alias, &r->query_reply); + r->local_alias, &r->query_reply.client_addr, + r->query_reply.client_addrlen); if(qstate->env->cfg->stat_extended && actinfo.rpz_used) { if(actinfo.rpz_disabled) |