mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-02 13:23:44 +00:00
watchfrr: indent to Linux CodingStyle
before this patch, watchfrr was using an inconsistent style that matched neither GNU nor Linux kernel nor BSD style. Reindent to Linux kernel style, which should be pretty close to pimd & ldpd. indent (2.2.11) options used: -nbad -bap -nbc -bbo -hnl -br -brs -c33 -cd33 -ncdb -ce -ci4 -cli0 -d0 -di1 -nfc1 -i8 -ip0 -l80 -lp -npcs -nprs -npsl -sai -saf -saw -ncs -nsc -sob -nfca -cp33 -ss -ts8 -il1 Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
parent
903c7f556e
commit
a6810074aa
2156
watchfrr/watchfrr.c
2156
watchfrr/watchfrr.c
File diff suppressed because it is too large
Load Diff
@ -26,4 +26,4 @@ extern void watchfrr_vty_init(void);
|
||||
extern pid_t integrated_write_pid;
|
||||
extern void integrated_write_sigchld(int status);
|
||||
|
||||
#endif /* FRR_WATCHFRR_H */
|
||||
#endif /* FRR_WATCHFRR_H */
|
||||
|
@ -31,18 +31,18 @@
|
||||
pid_t integrated_write_pid;
|
||||
static int integrated_result_fd;
|
||||
|
||||
DEFUN (config_write_integrated,
|
||||
config_write_integrated_cmd,
|
||||
"write integrated",
|
||||
"Write running configuration to memory, network, or terminal\n"
|
||||
"Write integrated all-daemon Frr.conf file\n")
|
||||
DEFUN(config_write_integrated,
|
||||
config_write_integrated_cmd,
|
||||
"write integrated",
|
||||
"Write running configuration to memory, network, or terminal\n"
|
||||
"Write integrated all-daemon Frr.conf file\n")
|
||||
{
|
||||
pid_t child;
|
||||
sigset_t oldmask, sigmask;
|
||||
|
||||
if (integrated_write_pid != -1) {
|
||||
vty_out(vty, "%% configuration write already in progress.%s",
|
||||
VTY_NEWLINE);
|
||||
VTY_NEWLINE);
|
||||
return CMD_WARNING;
|
||||
}
|
||||
|
||||
@ -61,20 +61,20 @@ DEFUN (config_write_integrated,
|
||||
child = fork();
|
||||
if (child == -1) {
|
||||
vty_out(vty, "%% configuration write fork() failed: %s.%s",
|
||||
safe_strerror(errno), VTY_NEWLINE);
|
||||
safe_strerror(errno), VTY_NEWLINE);
|
||||
sigprocmask(SIG_SETMASK, &oldmask, NULL);
|
||||
return CMD_WARNING;
|
||||
}
|
||||
if (child != 0) {
|
||||
/* note: the VTY won't write a command return value to vtysh; the
|
||||
* session temporarily enters an intentional "hang" state. This is
|
||||
* to make sure latency in vtysh doing the config write (several
|
||||
* seconds is not rare to see) does not interfere with watchfrr's
|
||||
* supervisor job.
|
||||
*
|
||||
* The fd is duplicated here so we don't need to hold a vty pointer
|
||||
* (which could become invalid in the meantime).
|
||||
*/
|
||||
/* note: the VTY won't write a command return value to vtysh; the
|
||||
* session temporarily enters an intentional "hang" state. This is
|
||||
* to make sure latency in vtysh doing the config write (several
|
||||
* seconds is not rare to see) does not interfere with watchfrr's
|
||||
* supervisor job.
|
||||
*
|
||||
* The fd is duplicated here so we don't need to hold a vty pointer
|
||||
* (which could become invalid in the meantime).
|
||||
*/
|
||||
integrated_write_pid = child;
|
||||
integrated_result_fd = dup(vty->wfd);
|
||||
sigprocmask(SIG_SETMASK, &oldmask, NULL);
|
||||
@ -93,7 +93,7 @@ DEFUN (config_write_integrated,
|
||||
/* unbuffered write; we just messed with stdout... */
|
||||
char msg[512];
|
||||
snprintf(msg, sizeof(msg), "error executing %s: %s\n",
|
||||
VTYSH_BIN_PATH, safe_strerror(errno));
|
||||
VTYSH_BIN_PATH, safe_strerror(errno));
|
||||
write(1, msg, strlen(msg));
|
||||
exit(1);
|
||||
}
|
||||
@ -104,11 +104,11 @@ void integrated_write_sigchld(int status)
|
||||
|
||||
if (WIFEXITED(status)) {
|
||||
zlog_info("configuration write completed with exit code %d",
|
||||
WEXITSTATUS(status));
|
||||
WEXITSTATUS(status));
|
||||
reply[3] = WEXITSTATUS(status);
|
||||
} else if (WIFSIGNALED(status)) {
|
||||
zlog_warn("configuration write terminated by signal %d",
|
||||
WTERMSIG(status));
|
||||
WTERMSIG(status));
|
||||
} else {
|
||||
zlog_warn("configuration write terminated");
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user