upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-07-16 01:12:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '3680-remove-nupdates' into 'main'

Browse source 
remove unused 'nupdates' field from client

Closes #3680

See merge request isc-projects/bind9!7098
This commit is contained in:
Evan Hunt 2022-11-24 00:01:56 +00:00
commit e2bbf38cdb
3 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/ns/client.c
View file

@ -219,7 +219,6 @@ ns_client_extendederror(ns_client_t *client, uint16_t code, const char *text) {
static void
ns_client_endrequest(ns_client_t *client) {
INSIST(client->nupdates == 0);
INSIST(client->state == NS_CLIENTSTATE_WORKING ||
client->state == NS_CLIENTSTATE_RECURSING);

1
lib/ns/include/ns/client.h
View file

@ -165,7 +165,6 @@ struct ns_client {
unsigned int magic;
ns_clientmgr_t *manager;
ns_clientstate_t state;
int nupdates;
bool nodetach;
unsigned int attributes;
dns_view_t *view;

11
lib/ns/update.c
View file

@ -1646,8 +1646,6 @@ send_update_event(ns_client_t *client, dns_zone_t *zone) {
event->zone = zone;
event->result = ISC_R_SUCCESS;
INSIST(client->nupdates == 0);
client->nupdates++;
event->ev_arg = client;
isc_nmhandle_attach(client->handle, &client->updatehandle);
@ -3545,7 +3543,6 @@ updatedone_action(isc_task_t *task, isc_event_t *event) {
REQUIRE(task == client->manager->task);
REQUIRE(client->updatehandle == client->handle);
INSIST(client->nupdates > 0);
switch (uev->result) {
case ISC_R_SUCCESS:
inc_stats(client, uev->zone, ns_statscounter_updatedone);
@ -3561,8 +3558,6 @@ updatedone_action(isc_task_t *task, isc_event_t *event) {
dns_zone_detach(&uev->zone);
}
client->nupdates--;
respond(client, uev->result);
isc_event_free(&event);
@ -3578,8 +3573,6 @@ forward_fail(isc_task_t *task, isc_event_t *event) {
UNUSED(task);
INSIST(client->nupdates > 0);
client->nupdates--;
respond(client, DNS_R_SERVFAIL);
isc_event_free(&event);
isc_nmhandle_detach(&client->updatehandle);
@ -3614,8 +3607,6 @@ forward_done(isc_task_t *task, isc_event_t *event) {
UNUSED(task);
INSIST(client->nupdates > 0);
client->nupdates--;
ns_client_sendraw(client, uev->answer);
dns_message_detach(&uev->answer);
isc_event_free(&event);
@ -3659,8 +3650,6 @@ send_forward_event(ns_client_t *client, dns_zone_t *zone) {
event->zone = zone;
event->result = ISC_R_SUCCESS;
INSIST(client->nupdates == 0);
client->nupdates++;
event->ev_arg = client;
dns_name_format(dns_zone_getorigin(zone), namebuf, sizeof(namebuf));