proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 13:33:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #960 from opensourcerouting/vty-fixes

Browse Source 
vty stdio & newline fixing
This commit is contained in:
Lou Berger 2017-08-11 11:30:42 -04:00 committed by GitHub
commit 518387fc66
2 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
bgpd/bgpd.c
View File

@ -6142,27 +6142,11 @@ char *peer_uptime(time_t uptime2, char *buf, size_t len, u_char use_json,
return buf; return buf;
} }
static void afi_header_vty_out(struct vty *vty, afi_t afi, safi_t safi, #define afi_header_vty_out(vty, afi, safi, write, format, ...) \
int *write, const char *format, ...) do { \
{ bgp_config_write_family_header(vty, afi, safi, write); \
va_list args; vty_out(vty, format, ## __VA_ARGS__); \
int len = 0; } while (0)
char buf[1024];
bgp_config_write_family_header(vty, afi, safi, write);
if (vty_shell(vty)) {
va_start(args, format);
vprintf(format, args);
va_end(args);
} else {
va_start(args, format);
len = vsnprintf(buf, sizeof(buf), format, args);
va_end(args);
buffer_put(vty->obuf, (u_char *)buf, len);
}
}
static void bgp_config_write_filter(struct vty *vty, struct peer *peer, static void bgp_config_write_filter(struct vty *vty, struct peer *peer,
afi_t afi, safi_t safi, int *write) afi_t afi, safi_t safi, int *write)

2
lib/libfrr.c
View File

@ -812,7 +812,7 @@ void frr_run(struct thread_master *master)
thread_add_read(master, frr_daemon_ctl, NULL, thread_add_read(master, frr_daemon_ctl, NULL,
daemon_ctl_sock, &daemon_ctl_thread); daemon_ctl_sock, &daemon_ctl_thread);
} }
} else { } else if (di->daemon_mode) {
int nullfd = open("/dev/null", O_RDONLY | O_NOCTTY); int nullfd = open("/dev/null", O_RDONLY | O_NOCTTY);
dup2(nullfd, 0); dup2(nullfd, 0);
dup2(nullfd, 1); dup2(nullfd, 1);