2004-12-03 Andrew J. Schorr <ajschorr@alumni.princeton.edu>

	* bgp_main.c: (sigint) Use zlog_notice for termination message.
	  (main) Use zlog_notice for startup announcement.
	* isis_main.c: (sigint,sigterm) Use zlog_notice for termination message.
	  (terminate) This function should be static, not global.
	  (main) Use zlog_notice for startup announcement, and remove
	  ifdef ZEBRA_VERSION.
	* version.h.in: Remove declaration for pid_output_lock, this function
	  is now static, not global.
	* pid_output.c: (pid_output_lock) This function should be static, not
	  global.  And remove "old umask" error message, since it was really
	  an unimportant debug message, not an error.
	  (pid_output) Need to declare static function pid_output_lock.
	* ospf6_main.c: (sigint,sigterm) Use zlog_notice for termination
	  message.
	  (main) Remove commented-out call to pid_output_lock (which should
	  never be called other than from inside pid_output).  And use
	  zlog_notice to print the startup message, which now includes
	  the vty port.
	* ospf_main.c: (sigint) Use zlog_notice for termination message.
	  (main) Issue a startup announcement using zlog_notice.
	* rip_main.c: (sigint) Use zlog_notice for termination message.
	  (main) Add a startup announcement using zlog_notice.
	* ripng_main.c: (sighup) Remove spurious terminating message.
	  (sigint) Use zlog_notice for termination message.
	  (main) Issue a startup announcement using zlog_notice.
	* main.c: (sigint) Use zlog_notice for termination message.
	  (main) Add a startup announcement using zlog_notice.

2 files changed, 16 insertions, 10 deletions

diff --git a/ospf6d/ChangeLog b/ospf6d/ChangeLog
index b5b529442..7bb6b4bf3 100644
--- a/ospf6d/ChangeLog
+++ b/ospf6d/ChangeLog
@@ -1,3 +1,12 @@
+2004-12-03 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+	* ospf6_main.c: (sigint,sigterm) Use zlog_notice for termination
+	  message.
+	  (main) Remove commented-out call to pid_output_lock (which should
+	  never be called other than from inside pid_output).  And use
+	  zlog_notice to print the startup message, which now includes
+	  the vty port.
+
 2004-11-26 Hasso Tepper <hasso at quagga.net>
 
 	* ospf6_snmp.c: Fix compile: listnode -> struct listnode *.
diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c
index 4563ece88..ba266d951 100644
--- a/ospf6d/ospf6_main.c
+++ b/ospf6d/ospf6_main.c
@@ -133,7 +133,7 @@ sighup (void)
 void
 sigint (void)
 {
-  zlog_info ("SIGINT received");
+  zlog_notice ("Terminating on signal SIGINT");
   exit (0);
 }
 
@@ -141,7 +141,7 @@ sigint (void)
 void
 sigterm (void)
 {
-  zlog_info ("SIGTERM received");
+  zlog_notice ("Terminating on signal SIGTERM");
   exit (0);
 }
 
@@ -281,19 +281,16 @@ main (int argc, char *argv[], char *envp[])
     daemon (0, 0);
 
   /* pid file create */
-#if 0
-  pid_output_lock (pid_file);
-#else
   pid_output (pid_file);
-#endif
 
   /* Make ospf6 vty socket. */
-  vty_serv_sock (vty_addr,
-                 vty_port ? vty_port : OSPF6_VTY_PORT, OSPF6_VTYSH_PATH);
+  if (!vty_port)
+    vty_port = OSPF6_VTY_PORT;
+  vty_serv_sock (vty_addr, vty_port, OSPF6_VTYSH_PATH);
 
   /* Print start message */
-  zlog_notice ("OSPF6d (Quagga-%s ospf6d-%s) starts",
-               QUAGGA_VERSION, OSPF6_DAEMON_VERSION);
+  zlog_notice ("OSPF6d (Quagga-%s ospf6d-%s) starts: vty@%d",
+               QUAGGA_VERSION, OSPF6_DAEMON_VERSION,vty_port);
 
   /* Start finite state machine, here we go! */
   while (thread_fetch (master, &thread))