Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bgp_vty: Fix vpn_leak_postchange_all() every time "router bgp ASNUM" context is entered #3325

Merged
merged 2 commits into from
Nov 26, 2018
Merged

bgp_vty: Fix vpn_leak_postchange_all() every time "router bgp ASNUM" context is entered #3325

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecec949
bgpd: Fix bgpd doing vpn_leak_postchange_all() every time "router bgp…
adeg Nov 14, 2018
3702f84
bgpd: add missing endline
adeg Nov 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions bgpd/bgp_vty.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ static int bgp_clear(struct vty *vty, struct bgp *bgp, afi_t afi, safi_t safi,
bgp->update_delay_over = 0;

if (!found)
vty_out(vty, "%%BGP: No %s peer configured",
vty_out(vty, "%%BGP: No %s peer configured\n",
afi_safi_print(afi, safi));

return CMD_SUCCESS;
Expand Down Expand Up @@ -972,6 +972,7 @@ DEFUN_NOSH (router_bgp,
int idx_asn = 2;
int idx_view_vrf = 3;
int idx_vrf = 4;
int is_new_bgp = 0;
int ret;
as_t as;
struct bgp *bgp;
Expand Down Expand Up @@ -1011,6 +1012,9 @@ DEFUN_NOSH (router_bgp,
inst_type = BGP_INSTANCE_TYPE_VIEW;
}

if (inst_type == BGP_INSTANCE_TYPE_DEFAULT)
is_new_bgp = (bgp_lookup(as, name) == NULL);

ret = bgp_get(&bgp, &as, name, inst_type);
switch (ret) {
case BGP_ERR_MULTIPLE_INSTANCE_NOT_SET:
Expand All @@ -1034,7 +1038,7 @@ DEFUN_NOSH (router_bgp,
* any pending VRF-VPN leaking that was configured via
* earlier "router bgp X vrf FOO" blocks.
*/
if (inst_type == BGP_INSTANCE_TYPE_DEFAULT)
if (is_new_bgp && inst_type == BGP_INSTANCE_TYPE_DEFAULT)
vpn_leak_postchange_all();

/* Pending: handle when user tries to change a view to vrf n vv.
Expand Down