From e3239b40d233b4d13bacda64ed8a86fc2db04d4f Mon Sep 17 00:00:00 2001
From: Michael Graff <mgraff@isc.org>
Date: Mon, 9 Sep 2002 21:20:16 +0000
Subject: [PATCH] remove the periodic 'still alive' message

---
 bin/named/include/named/server.h |  3 +--
 bin/named/server.c               | 31 +------------------------------
 2 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/bin/named/include/named/server.h b/bin/named/include/named/server.h
index 459043f02a..ac3d1a21a8 100644
--- a/bin/named/include/named/server.h
+++ b/bin/named/include/named/server.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.h,v 1.67 2002/09/08 18:34:04 explorer Exp $ */
+/* $Id: server.h,v 1.68 2002/09/09 21:20:16 explorer Exp $ */
 
 #ifndef NAMED_SERVER_H
 #define NAMED_SERVER_H 1
@@ -73,7 +73,6 @@ struct ns_server {
 
 	isc_timer_t *		interface_timer;
 	isc_timer_t *		heartbeat_timer;
-	isc_timer_t *		check_timer;
 	isc_uint32_t		interface_interval;
 	isc_uint32_t		heartbeat_interval;
 
diff --git a/bin/named/server.c b/bin/named/server.c
index f0d6442f81..574dd25eec 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.385 2002/09/09 20:03:18 explorer Exp $ */
+/* $Id: server.c,v 1.386 2002/09/09 21:20:15 explorer Exp $ */
 
 #include <config.h>
 
@@ -1561,16 +1561,6 @@ heartbeat_timer_tick(isc_task_t *task, isc_event_t *event) {
 	}
 }
 
-static void
-check_timer_tick(isc_task_t *task, isc_event_t *event) {
-	UNUSED(task);
-	isc_event_free(&event);
-
-	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
-		      NS_LOGMODULE_SERVER, ISC_LOG_INFO,
-		      "************ I'm still alive! **************");
-}
-
 /*
  * Replace the current value of '*field', a dynamically allocated
  * string or NULL, with a dynamically allocated copy of the
@@ -1912,17 +1902,6 @@ load_configuration(const char *filename, ns_server_t *server,
 	}
 	server->heartbeat_interval = heartbeat_interval;
 
-	/*
-	 * Configure the dialup heartbeat timer.
-	 */
-	{
-		isc_interval_t interval;
-		isc_interval_set(&interval, 60, 0);
-		CHECK(isc_timer_reset(server->check_timer,
-				      isc_timertype_ticker,
-				      NULL, &interval, ISC_FALSE));
-	}
-
 	/*
 	 * Configure and freeze all explicit views.  Explicit
 	 * views that have zones were already created at parsing
@@ -2309,12 +2288,6 @@ run_server(isc_task_t *task, isc_event_t *event) {
 				    server, &server->heartbeat_timer),
 		   "creating heartbeat timer");
 
-	CHECKFATAL(isc_timer_create(ns_g_timermgr, isc_timertype_inactive,
-				    NULL, NULL, server->task,
-				    check_timer_tick,
-				    server, &server->check_timer),
-		   "creating check timer");
-
 	CHECKFATAL(cfg_parser_create(ns_g_mctx, NULL, &ns_g_parser),
 		   "creating default configuration parser");
 
@@ -2376,7 +2349,6 @@ shutdown_server(isc_task_t *task, isc_event_t *event) {
 
 	isc_timer_detach(&server->interface_timer);
 	isc_timer_detach(&server->heartbeat_timer);
-	isc_timer_detach(&server->check_timer);
 
 	ns_interfacemgr_shutdown(server->interfacemgr);
 	ns_interfacemgr_detach(&server->interfacemgr);
@@ -2464,7 +2436,6 @@ ns_server_create(isc_mem_t *mctx, ns_server_t **serverp) {
 
 	server->interface_timer = NULL;
 	server->heartbeat_timer = NULL;
-	server->check_timer = NULL;
 	
 	server->interface_interval = 0;
 	server->heartbeat_interval = 0;