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

Working/master/pre vpn vrf leak indenting #1735

Merged
merged 6 commits into from
Feb 10, 2018
Merged

Working/master/pre vpn vrf leak indenting #1735

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4e5c876
bgpd: json route table brace counting
paulzlabn Feb 9, 2018
9386b58
bgpd: json route table brace counting
paulzlabn Feb 9, 2018
70a9454
Merge branch 'working/master/json-bgp-vpn-fixes' of https://github.co…
paulzlabn Feb 9, 2018
9611232
also protect ALIAS from indenting
paulzlabn Feb 9, 2018
a4d82a8
bgpd: ran indent.py on some files prior to bgp vpn-vrf leaking changes
paulzlabn Feb 9, 2018
d316210
whitespace/comment fixes per qlyoung
paulzlabn Feb 9, 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
4 changes: 2 additions & 2 deletions bgpd/bgp_debug.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,8 +385,8 @@ int bgp_dump_attr(struct attr *attr, char *buf, size_t size)

if (CHECK_FLAG(attr->flag, ATTR_FLAG_BIT(BGP_ATTR_COMMUNITIES)))
snprintf(buf + strlen(buf), size - strlen(buf),
", community %s", community_str(attr->community,
false));
", community %s",
community_str(attr->community, false));

if (CHECK_FLAG(attr->flag, ATTR_FLAG_BIT(BGP_ATTR_EXT_COMMUNITIES)))
snprintf(buf + strlen(buf), size - strlen(buf),
Expand Down
6 changes: 3 additions & 3 deletions bgpd/bgp_debug.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,9 @@ extern int bgp_debug_zebra(struct prefix *p);

extern int bgp_debug_count(void);
extern const char *bgp_debug_rdpfxpath2str(afi_t, safi_t, struct prefix_rd *,
union prefixconstptr,
mpls_label_t *, u_int32_t,
int, u_int32_t, char *, int);
union prefixconstptr, mpls_label_t *,
u_int32_t, int, u_int32_t, char *,
int);
const char *bgp_notify_admin_message(char *buf, size_t bufsz, u_char *data,
size_t datalen);

Expand Down
6 changes: 3 additions & 3 deletions bgpd/bgp_mplsvpn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,8 +366,8 @@ int bgp_show_mpls_vpn(struct vty *vty, afi_t afi, struct prefix_rd *prd,
return CMD_WARNING;
}
table = bgp->rib[afi][SAFI_MPLS_VPN];
return bgp_show_table_rd(vty, bgp, SAFI_MPLS_VPN,
table, prd, type, output_arg, use_json);
return bgp_show_table_rd(vty, bgp, SAFI_MPLS_VPN, table, prd, type,
output_arg, use_json);
}

DEFUN (show_bgp_ip_vpn_all_rd,
Expand All @@ -389,7 +389,7 @@ DEFUN (show_bgp_ip_vpn_all_rd,

if (argv_find_and_parse_afi(argv, argc, &idx, &afi)) {
if (argv_find(argv, argc, "rd", &idx)) {
ret = str2prefix_rd(argv[idx+1]->arg, &prd);
ret = str2prefix_rd(argv[idx + 1]->arg, &prd);
if (!ret) {
vty_out(vty,
"%% Malformed Route Distinguisher\n");
Expand Down
Loading