diff options
author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-02-02 16:42:51 +0100 |
---|---|---|
committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-02-02 16:42:51 +0100 |
commit | 1a35e2e56533f75d68ed30bf24b3c131da4ba950 (patch) | |
tree | 068c7730ed7a58d5374d8123d81720597b40bbcd /bgpd/bgp_dump.c | |
parent | Merge pull request #135 from LabNConsulting/working/master/patch-set/misc+vrf (diff) | |
parent | Merge pull request #153 from LabNConsulting/working/2.0/patch-set/rr-part2 (diff) | |
download | frr-1a35e2e56533f75d68ed30bf24b3c131da4ba950.tar.xz frr-1a35e2e56533f75d68ed30bf24b3c131da4ba950.zip |
Merge remote-tracking branch 'origin/stable/2.0'
Diffstat (limited to 'bgpd/bgp_dump.c')
-rw-r--r-- | bgpd/bgp_dump.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/bgpd/bgp_dump.c b/bgpd/bgp_dump.c index 8dd753d27..84ece4885 100644 --- a/bgpd/bgp_dump.c +++ b/bgpd/bgp_dump.c @@ -91,7 +91,7 @@ struct bgp_dump struct thread *t_interval; }; -static int bgp_dump_unset (struct vty *vty, struct bgp_dump *bgp_dump); +static int bgp_dump_unset (struct bgp_dump *bgp_dump); static int bgp_dump_interval_func (struct thread *); /* BGP packet dump output buffer. */ @@ -657,7 +657,7 @@ bgp_dump_set (struct vty *vty, struct bgp_dump *bgp_dump, } /* Removing previous config */ - bgp_dump_unset(vty, bgp_dump); + bgp_dump_unset(bgp_dump); if (interval_str) { @@ -696,7 +696,7 @@ bgp_dump_set (struct vty *vty, struct bgp_dump *bgp_dump, } static int -bgp_dump_unset (struct vty *vty, struct bgp_dump *bgp_dump) +bgp_dump_unset (struct bgp_dump *bgp_dump) { /* Removing file name. */ if (bgp_dump->filename) @@ -817,7 +817,7 @@ DEFUN (no_dump_bgp_all, break; } - return bgp_dump_unset (vty, bgp_dump_struct); + return bgp_dump_unset (bgp_dump_struct); } /* BGP node structure. */ @@ -919,6 +919,10 @@ bgp_dump_init (void) void bgp_dump_finish (void) { + bgp_dump_unset (&bgp_dump_all); + bgp_dump_unset (&bgp_dump_updates); + bgp_dump_unset (&bgp_dump_routes); + stream_free (bgp_dump_obuf); bgp_dump_obuf = NULL; } |