From 055e3c88e6d88bd7dee5ae9c87dc04433124f660 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 31 Aug 1998 04:19:31 +0000 Subject: set a maximum name refresh time of 20 minutes. The previous code was strictly correct, but not very practical. self names were only refreshed every 3 days. I hit a situation where the Samba WINS server was restarted after deleting wins.dat and didn't notice some remote subnets (also running Samba). I realised that the complete database wouldn't have been rebuilt for 3 days, which is way too long. In order to recover from WINS restarts we need a much shorter maximum refresh time. (This used to be commit 1d23dd0912e81ff72695bd043e8e2aee32da18a8) --- source3/include/nameserv.h | 4 ++++ source3/nmbd/nmbd_mynames.c | 2 +- source3/nmbd/nmbd_namelistdb.c | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/source3/include/nameserv.h b/source3/include/nameserv.h index fe00a1415d..c219a1f723 100644 --- a/source3/include/nameserv.h +++ b/source3/include/nameserv.h @@ -546,6 +546,10 @@ struct packet_struct /* Do all remote announcements this often. */ #define REMOTE_ANNOUNCE_INTERVAL 180 +/* what is the maximum period between name refreshes. Note that this only + affects non-permanent self names */ +#define MAX_REFRESH_TIME (60*20) + /* Types of machine we can announce as. */ #define ANNOUNCE_AS_NT 1 #define ANNOUNCE_AS_WIN95 2 diff --git a/source3/nmbd/nmbd_mynames.c b/source3/nmbd/nmbd_mynames.c index ba42274165..4a4e102786 100644 --- a/source3/nmbd/nmbd_mynames.c +++ b/source3/nmbd/nmbd_mynames.c @@ -197,7 +197,7 @@ void refresh_my_names(time_t t) if( !is_refresh_already_queued( subrec, namerec) ) refresh_name( subrec, namerec, NULL, NULL, NULL ); namerec->data.death_time += lp_max_ttl(); - namerec->data.refresh_time += lp_max_ttl(); + namerec->data.refresh_time += MIN(lp_max_ttl(), MAX_REFRESH_TIME); } } } diff --git a/source3/nmbd/nmbd_namelistdb.c b/source3/nmbd/nmbd_namelistdb.c index de5835a115..498cbcfdcf 100644 --- a/source3/nmbd/nmbd_namelistdb.c +++ b/source3/nmbd/nmbd_namelistdb.c @@ -186,7 +186,7 @@ void update_name_ttl( struct name_record *namerec, int ttl ) if( namerec->data.death_time != PERMANENT_TTL ) namerec->data.death_time = time_now + ttl; - namerec->data.refresh_time = time_now + (ttl/2); + namerec->data.refresh_time = time_now + MIN((ttl/2), MAX_REFRESH_TIME); namerec->subnet->namelist_changed = True; } /* update_name_ttl */ @@ -251,7 +251,7 @@ struct name_record *add_name_to_subnet( struct subnet_record *subrec, else namerec->data.death_time = time_now + ttl; - namerec->data.refresh_time = time_now + (ttl/2); + namerec->data.refresh_time = time_now + MIN((ttl/2), MAX_REFRESH_TIME); /* Now add the record to the name list. */ update_name_in_namelist( subrec, namerec ); -- cgit