svn commit: samba r13005 - in branches/SAMBA_4_0/source/nbt_server/wins: .

[metze at samba.org]

Author: metze
Date: 2006-01-18 16:27:29 +0000 (Wed, 18 Jan 2006)
New Revision: 13005

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13005

Log:
- use nbtd:max_refresh_time=12345 also for name refresh with a wins server

metze
Modified:
   branches/SAMBA_4_0/source/nbt_server/wins/winsclient.c


Changeset:
Modified: branches/SAMBA_4_0/source/nbt_server/wins/winsclient.c
===================================================================
--- branches/SAMBA_4_0/source/nbt_server/wins/winsclient.c	2006-01-18 16:20:33 UTC (rev 13004)
+++ branches/SAMBA_4_0/source/nbt_server/wins/winsclient.c	2006-01-18 16:27:29 UTC (rev 13005)
@@ -27,6 +27,7 @@
 #include "lib/events/events.h"
 #include "smbd/service_task.h"
 
+static void nbtd_wins_refresh_handler(struct composite_context *c);
 
 /* we send WINS client requests using our primary network interface 
 */
@@ -50,7 +51,22 @@
 	nbtd_winsclient_register(iname);
 }
 
+/*
+  start a timer to refresh this name
+*/
+static void nbtd_wins_start_refresh_timer(struct nbtd_iface_name *iname)
+{
+	uint32_t refresh_time;
+	uint32_t max_refresh_time = lp_parm_int(-1, "nbtd", "max_refresh_time", 7200);
 
+	refresh_time = MIN(max_refresh_time, iname->ttl/2);
+	
+	event_add_timed(iname->iface->nbtsrv->task->event_ctx, 
+			iname, 
+			timeval_add(&iname->registration_time, refresh_time, 0),
+			nbtd_wins_refresh, iname);
+}
+
 /*
   called when a wins name refresh has completed
 */
@@ -99,11 +115,7 @@
 	iname->wins_server = talloc_steal(iname, io.out.wins_server);
 
 	iname->registration_time = timeval_current();
-	event_add_timed(iname->iface->nbtsrv->task->event_ctx, 
-			iname,
-			timeval_add(&iname->registration_time, iname->ttl/2, 0),
-			nbtd_wins_refresh,
-			iname);
+	nbtd_wins_start_refresh_timer(iname);
 
 	talloc_free(tmp_ctx);
 }
@@ -196,11 +208,7 @@
 	iname->wins_server = talloc_steal(iname, io.out.wins_server);
 
 	iname->registration_time = timeval_current();
-	event_add_timed(iname->iface->nbtsrv->task->event_ctx, 
-			iname,
-			timeval_add(&iname->registration_time, iname->ttl/2, 0),
-			nbtd_wins_refresh,
-			iname);
+	nbtd_wins_start_refresh_timer(iname);
 
 	DEBUG(3,("Registered %s with WINS server %s\n",
 		 nbt_name_string(tmp_ctx, &iname->name), iname->wins_server));