summaryrefslogtreecommitdiff
path: root/ospfd
diff options
context:
space:
mode:
authorajs <ajs>2004-12-03 16:36:46 +0000
committerajs <ajs>2004-12-03 16:36:46 +0000
commit887c44a4f3d8219dc5b1c52b5dcde1f31d52b73d (patch)
tree5c0ef5fe1d3948c56e6abf2ffd3c9811e92f0f2e /ospfd
parentbec595ada58ebfa98ad49220f29ab28b58549094 (diff)
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.
Diffstat (limited to 'ospfd')
-rw-r--r--ospfd/ChangeLog5
-rw-r--r--ospfd/ospf_main.c6
2 files changed, 7 insertions, 4 deletions
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 92651f2f..ff54a507 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-03 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+ * ospf_main.c: (sigint) Use zlog_notice for termination message.
+ (main) Issue a startup announcement using zlog_notice.
+
2004-11-30 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* ospf_packet.c: (ospf_db_desc_proc) Fix spelling of packet in warning
diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index 09ff197a..d155c980 100644
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -141,7 +141,7 @@ sighup (void)
void
sigint (void)
{
- zlog (NULL, LOG_INFO, "Terminating on signal");
+ zlog_notice ("Terminating on signal");
ospf_terminate ();
@@ -317,10 +317,8 @@ main (int argc, char **argv)
/* Create VTY socket */
vty_serv_sock (vty_addr, vty_port, OSPF_VTYSH_PATH);
-#ifdef DEBUG
/* Print banner. */
- zlog (NULL, LOG_INFO, "OSPFd (%s) starts", QUAGGA_VERSION);
-#endif
+ zlog_notice ("OSPFd %s starting: vty@%d", QUAGGA_VERSION, vty_port);
/* Fetch next active thread. */
while (thread_fetch (master, &thread))