diff options
Diffstat (limited to 'watchquagga')
| -rw-r--r-- | watchquagga/.gitignore | 16 | ||||
| -rw-r--r-- | watchquagga/ChangeLog | 59 | ||||
| -rw-r--r-- | watchquagga/Makefile.am | 3 | ||||
| -rw-r--r-- | watchquagga/watchquagga.c | 4 |
4 files changed, 23 insertions, 59 deletions
diff --git a/watchquagga/.gitignore b/watchquagga/.gitignore new file mode 100644 index 00000000..b6226d53 --- /dev/null +++ b/watchquagga/.gitignore @@ -0,0 +1,16 @@ +Makefile +Makefile.in +*.o +watchquagga +tags +TAGS +.deps +.nfs* +*.lo +*.la +*.libs +.arch-inventory +.arch-ids +*~ +*.loT + diff --git a/watchquagga/ChangeLog b/watchquagga/ChangeLog deleted file mode 100644 index 7baf4b7c..00000000 --- a/watchquagga/ChangeLog +++ /dev/null @@ -1,59 +0,0 @@ -2005-02-17 Andrew J. Schorr <ajschorr@alumni.princeton.edu> - - * watchquagga.c: (handle_read) Use new ERRNO_IO_RETRY macro. - -2005-02-16 Andrew J. Schorr <ajschorr@alumni.princeton.edu> - - * watchquagga.c: (try_connect) Use new set_nonblocking function instead - of calling fcntl directly. - -2005-01-12 Andrew J. Schorr <ajschorr@alumni.princeton.edu> - - * watchquagga.c: (run_job) Fix bug: delay.tv_sec was being used - without having been initialized when the "force" argument was true. - (try_restart) When phased restart is stopping the routing daemons, - it should tell run_job to update the restart interval. - (phase_check) In final step of phased restart when the routing - daemons are being started again, tell run_job not to update - the restart interval (this is now done when the daemons are - stopped). - -2004-12-29 Andrew J. Schorr <ajschorr@alumni.princeton.edu> - - * watchquagga.c: In several places, cast pid_t to int for printf to - avoid complaints on Solaris 8. - -2004-12-29 Andrew J. Schorr <ajschorr@alumni.princeton.edu> - - * watchquagga.c: Fix headers: get most stuff from zebra.h. - -2004-12-23 Paul Jakma <paul@dishone.st> - - * watchquagga.c: Add missing getopt.h include - -2004-12-22 Andrew J. Schorr <ajschorr@alumni.princeton.edu> - - * watchquagga.c: Try for gcc 2.95 compatibility (avoid %z and a tricky - initialization). - -2004-12-22 Andrew J. Schorr <ajschorr@alumni.princeton.edu> - - * watchquagga.c: Add -b option to circumvent difficulties passing - embedded spaces in command-line arguments. This is an ugly hack, - we should probably use a config file instead. - -2004-12-22 Andrew J. Schorr <ajschorr@alumni.princeton.edu> - - * watchquagga.c: Use new config.h define for DAEMON_VTY_DIR. - -2004-12-22 Andrew J. Schorr <ajschorr@alumni.princeton.edu> - - * watchquagga.c: Get PATH_WATCHQUAGGA_PID from config.h. - -2004-12-21 Andrew J. Schorr <ajschorr@alumni.princeton.edu> - - * .cvsignore: Added. - -2004-12-21 Andrew J. Schorr <ajschorr@alumni.princeton.edu> - - * {ChangeLog,watchquagga.c,Makefile.am}: Created. diff --git a/watchquagga/Makefile.am b/watchquagga/Makefile.am index e422535a..a49f62e8 100644 --- a/watchquagga/Makefile.am +++ b/watchquagga/Makefile.am @@ -3,6 +3,9 @@ INCLUDES = @INCLUDES@ -I$(top_srcdir) -I$(top_srcdir)/lib DEFS = @DEFS@ -DSTATEDIR=\"$(localstatedir)/\" +AM_CFLAGS = $(PICFLAGS) +AM_LDFLAGS = $(PILDFLAGS) + sbin_PROGRAMS = watchquagga watchquagga_SOURCES = watchquagga.c diff --git a/watchquagga/watchquagga.c b/watchquagga/watchquagga.c index 90cff00f..4f7855ab 100644 --- a/watchquagga/watchquagga.c +++ b/watchquagga/watchquagga.c @@ -1,5 +1,9 @@ /* +<<<<<<< HEAD:watchquagga/watchquagga.c $Id: watchquagga.c,v 1.12 2007/05/10 02:38:52 paul Exp $ +======= + $Id$ +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:watchquagga/watchquagga.c Monitor status of quagga daemons and restart if necessary. |