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

bgpd: flock() dump files (BZ#742)

Browse Source 
flock()ing the BGP dump files helps consumers determine when they're
safe to read.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
Daniel Kozlowski 2012-09-26 12:01:24 +00:00 committed by David Lamparter
parent 3f0bfc9e82
commit b07458a055
1 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
bgpd/bgp_dump.c
View File

@ -95,6 +95,7 @@ static FILE *
bgp_dump_open_file (struct bgp_dump *bgp_dump)
{
int ret;
int fd;
time_t clock;
struct tm *tm;
char fullpath[MAXPATHLEN];
@ -131,6 +132,16 @@ bgp_dump_open_file (struct bgp_dump *bgp_dump)
umask(oldumask);
return NULL;
}
else
{
fd = fileno(bgp_dump->fp);
ret = flock( fd, LOCK_EX );
if (ret != 0)
{
zlog_warn ("bgp_dump_open_file: Unable to flock() file %s: %s", realpath, strerror (errno));
}
}
umask(oldumask);
return bgp_dump->fp;
@ -195,6 +206,7 @@ bgp_dump_set_size (struct stream *s, int type)
static void
bgp_dump_routes_index_table(struct bgp *bgp)
{
int ret;
struct peer *peer;
struct listnode *node;
uint16_t peerno = 0;
@ -266,7 +278,11 @@ bgp_dump_routes_index_table(struct bgp *bgp)
bgp_dump_set_size(obuf, MSG_TABLE_DUMP_V2);
fwrite (STREAM_DATA (obuf), stream_get_endp (obuf), 1, bgp_dump_routes.fp);
ret = fwrite (STREAM_DATA (obuf), stream_get_endp (obuf), 1, bgp_dump_routes.fp);
if (ret != 1)
{
zlog_warn ("bgp_dump_routes_index_table: fwrite returned %d, expected 1: %s", ret, strerror (errno));
}
fflush (bgp_dump_routes.fp);
}
@ -275,6 +291,7 @@ bgp_dump_routes_index_table(struct bgp *bgp)
static unsigned int
bgp_dump_routes_func (int afi, int first_run, unsigned int seq)
{
int ret;
struct stream *obuf;
struct bgp_info *info;
struct bgp_node *rn;
@ -373,8 +390,11 @@ bgp_dump_routes_func (int afi, int first_run, unsigned int seq)
seq++;
bgp_dump_set_size(obuf, MSG_TABLE_DUMP_V2);
fwrite (STREAM_DATA (obuf), stream_get_endp (obuf), 1, bgp_dump_routes.fp);
ret = fwrite (STREAM_DATA (obuf), stream_get_endp (obuf), 1, bgp_dump_routes.fp);
if (ret != 1)
{
zlog_warn ("bgp_dump_routes_func: fwrite returned %d, expected 1: %s", ret, strerror (errno));
}
}
fflush (bgp_dump_routes.fp);
@ -464,6 +484,7 @@ bgp_dump_common (struct stream *obuf, struct peer *peer, int forceas4)
void
bgp_dump_state (struct peer *peer, int status_old, int status_new)
{
int ret;
struct stream *obuf;
/* If dump file pointer is disabled return immediately. */
@ -484,7 +505,11 @@ bgp_dump_state (struct peer *peer, int status_old, int status_new)
bgp_dump_set_size (obuf, MSG_PROTOCOL_BGP4MP);
/* Write to the stream. */
fwrite (STREAM_DATA (obuf), stream_get_endp (obuf), 1, bgp_dump_all.fp);
ret = fwrite (STREAM_DATA (obuf), stream_get_endp (obuf), 1, bgp_dump_all.fp);
if (ret != 1)
{
zlog_warn ("bgp_dump_state: fwrite returned %d, expected 1: %s", ret, strerror (errno));
}
fflush (bgp_dump_all.fp);
}
@ -492,6 +517,7 @@ static void
bgp_dump_packet_func (struct bgp_dump *bgp_dump, struct peer *peer,
struct stream *packet)
{
int ret;
struct stream *obuf;
/* If dump file pointer is disabled return immediately. */
@ -520,7 +546,11 @@ bgp_dump_packet_func (struct bgp_dump *bgp_dump, struct peer *peer,
bgp_dump_set_size (obuf, MSG_PROTOCOL_BGP4MP);
/* Write to the stream. */
fwrite (STREAM_DATA (obuf), stream_get_endp (obuf), 1, bgp_dump->fp);
ret = fwrite (STREAM_DATA (obuf), stream_get_endp (obuf), 1, bgp_dump->fp);
if (ret != 1)
{
zlog_warn ("bgp_dump_packet_func: fwrite returned %d, expected 1: %s", ret, strerror (errno));
}
fflush (bgp_dump->fp);
}