upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- auth zone notify work.

Browse source 
git-svn-id: file:///svn/unbound/trunk@4627 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2018-04-17 12:18:34 +00:00
parent 4809fe1b95
commit 630600e70d
2 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/Changelog
View file

@ -1,3 +1,6 @@
17 April 2018: Wouter
- auth zone notify work.
16 April 2018: Wouter 16 April 2018: Wouter
- Fix auth zone target lookup iterator. - Fix auth zone target lookup iterator.
- auth zone notify with prefix - auth zone notify with prefix

44
services/authzone.c
View file

@ -3312,6 +3312,30 @@ xfr_serial_means_update(struct auth_xfer* xfr, uint32_t serial)
return 0; return 0;
} }
/** note notify serial, updates the notify information in the xfr struct */
static void
xfr_note_notify_serial(struct auth_xfer* xfr, int has_serial, uint32_t serial)
{
if(xfr->notify_received && xfr->notify_has_serial && has_serial) {
/* see if this serial is newer */
if(compare_serial(xfr->notify_serial, serial) < 0)
xfr->notify_serial = serial;
} else if(xfr->notify_received && xfr->notify_has_serial &&
!has_serial) {
/* remove serial, we have notify without serial */
xfr->notify_has_serial = 0;
xfr->notify_serial = 0;
} else if(xfr->notify_received && !xfr->notify_has_serial) {
/* we already have notify without serial, keep it
* that way; no serial check when current operation
* is done */
} else {
xfr->notify_received = 1;
xfr->notify_has_serial = has_serial;
xfr->notify_serial = serial;
}
}
/** process a notify serial, start new probe or note serial. xfr is locked */ /** process a notify serial, start new probe or note serial. xfr is locked */
static void static void
xfr_process_notify(struct auth_xfer* xfr, struct module_env* env, xfr_process_notify(struct auth_xfer* xfr, struct module_env* env,
@ -3324,25 +3348,7 @@ xfr_process_notify(struct auth_xfer* xfr, struct module_env* env,
/* start new probe with this addr src, or note serial */ /* start new probe with this addr src, or note serial */
if(!xfr_start_probe(xfr, env, fromhost)) { if(!xfr_start_probe(xfr, env, fromhost)) {
/* not started because already in progress, note the serial */ /* not started because already in progress, note the serial */
if(xfr->notify_received && xfr->notify_has_serial && xfr_note_notify_serial(xfr, has_serial, serial);
has_serial) {
/* see if this serial is newer */
if(compare_serial(xfr->notify_serial, serial) < 0)
xfr->notify_serial = serial;
} else if(xfr->notify_received && xfr->notify_has_serial &&
!has_serial) {
/* remove serial, we have notify without serial */
xfr->notify_has_serial = 0;
xfr->notify_serial = 0;
} else if(xfr->notify_received && !xfr->notify_has_serial) {
/* we already have notify without serial, keep it
* that way; no serial check when current operation
* is done */
} else {
xfr->notify_received = 1;
xfr->notify_has_serial = has_serial;
xfr->notify_serial = serial;
}
lock_basic_unlock(&xfr->lock); lock_basic_unlock(&xfr->lock);
} }
} }