proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-17 19:05:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* watchquagga.c: Try for gcc 2.95 compatibility (avoid %z and a tricky
	  initialization).
This commit is contained in:
ajs 2004-12-22 17:00:46 +00:00
parent 341a8f1ac9
commit 098e240fdf
2 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
watchquagga/ChangeLog
View File

@ -1,3 +1,8 @@
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> 2004-12-22 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* watchquagga.c: Add -b option to circumvent difficulties passing * watchquagga.c: Add -b option to circumvent difficulties passing

48
watchquagga/watchquagga.c
View File

@ -1,5 +1,5 @@
/* /*
$Id: watchquagga.c,v 1.4 2004/12/22 16:17:16 ajs Exp $ $Id: watchquagga.c,v 1.5 2004/12/22 17:00:46 ajs Exp $
Monitor status of quagga daemons and restart if necessary. Monitor status of quagga daemons and restart if necessary.
@ -31,6 +31,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <time.h> #include <time.h>
#include <string.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/wait.h> #include <sys/wait.h>
@ -113,7 +114,19 @@ static const char *phase_str[] =
#define PHASE_TIMEOUT (3*gs.restart_timeout) #define PHASE_TIMEOUT (3*gs.restart_timeout)
static struct global_state { struct restart_info
{
const char *name;
const char *what;
pid_t pid;
struct timeval time;
long interval;
struct thread *t_kill;
int kills;
};
static struct global_state
{
watch_mode_t mode; watch_mode_t mode;
restart_phase_t phase; restart_phase_t phase;
struct thread *t_phase_hanging; struct thread *t_phase_hanging;
@ -128,16 +141,7 @@ static struct global_state {
const char *restart_command; const char *restart_command;
const char *start_command; const char *start_command;
const char *stop_command; const char *stop_command;
struct restart_info struct restart_info restart;
{
const char *name;
const char *what;
pid_t pid;
struct timeval time;
long interval;
struct thread *t_kill;
int kills;
} restart;
int unresponsive_restart; int unresponsive_restart;
int loglevel; int loglevel;
struct daemon *special; /* points to zebra when doing phased restart */ struct daemon *special; /* points to zebra when doing phased restart */
@ -155,7 +159,6 @@ static struct global_state {
.min_restart_interval = DEFAULT_MIN_RESTART, .min_restart_interval = DEFAULT_MIN_RESTART,
.max_restart_interval = DEFAULT_MAX_RESTART, .max_restart_interval = DEFAULT_MAX_RESTART,
.do_ping = 1, .do_ping = 1,
.restart.name = "all",
}; };
typedef enum typedef enum
@ -637,8 +640,8 @@ handle_read(struct thread *t_read)
if (!dmn->echo_sent.tv_sec) if (!dmn->echo_sent.tv_sec)
{ {
char why[sizeof(buf)+100]; char why[sizeof(buf)+100];
snprintf(why,sizeof(why),"unexpected read returns %zd bytes: %.*s", snprintf(why,sizeof(why),"unexpected read returns %d bytes: %.*s",
rc,rc,buf); (int)rc,(int)rc,buf);
daemon_down(dmn,why); daemon_down(dmn,why);
return 0; return 0;
} }
@ -649,9 +652,9 @@ handle_read(struct thread *t_read)
if ((rc != sizeof(resp)) || memcmp(buf,resp,sizeof(resp))) if ((rc != sizeof(resp)) || memcmp(buf,resp,sizeof(resp)))
{ {
char why[100+sizeof(buf)]; char why[100+sizeof(buf)];
snprintf(why,sizeof(why),"read returned bad echo response of %zd bytes " snprintf(why,sizeof(why),"read returned bad echo response of %d bytes "
"(expecting %zu): %.*s", "(expecting %u): %.*s",
rc,sizeof(resp),rc,buf); (int)rc,(u_int)sizeof(resp),(int)rc,buf);
daemon_down(dmn,why); daemon_down(dmn,why);
return 0; return 0;
} }
@ -993,8 +996,8 @@ wakeup_send_echo(struct thread *t_wakeup)
((size_t)rc != sizeof(echocmd))) ((size_t)rc != sizeof(echocmd)))
{ {
char why[100+sizeof(echocmd)]; char why[100+sizeof(echocmd)];
snprintf(why,sizeof(why),"write '%s' returned %zd instead of %zu", snprintf(why,sizeof(why),"write '%s' returned %d instead of %u",
echocmd,rc,sizeof(echocmd)); echocmd,(int)rc,(u_int)sizeof(echocmd));
daemon_down(dmn,why); daemon_down(dmn,why);
} }
else else
@ -1073,6 +1076,7 @@ main(int argc, char **argv)
else else
progname = argv[0]; progname = argv[0];
gs.restart.name = "all";
while ((opt = getopt_long(argc, argv, "aAb:dek:l:m:M:i:p:r:R:S:s:t:T:zvh", while ((opt = getopt_long(argc, argv, "aAb:dek:l:m:M:i:p:r:R:S:s:t:T:zvh",
longopts, 0)) != EOF) longopts, 0)) != EOF)
{ {
@ -1311,8 +1315,8 @@ main(int argc, char **argv)
if (!(dmn = (struct daemon *)calloc(1,sizeof(*dmn)))) if (!(dmn = (struct daemon *)calloc(1,sizeof(*dmn))))
{ {
fprintf(stderr,"calloc(1,%zu) failed: %s\n", fprintf(stderr,"calloc(1,%u) failed: %s\n",
sizeof(*dmn), safe_strerror(errno)); (u_int)sizeof(*dmn), safe_strerror(errno));
return 1; return 1;
} }
dmn->name = dmn->restart.name = argv[i]; dmn->name = dmn->restart.name = argv[i];