Merge pull request #1735 from LabNConsulting/working/master/pre-vpn-v…

…rf-leak-indenting Working/master/pre vpn vrf leak indenting
FRRouting · Feb 10, 2018 · 4200166 · 4200166
2 parents 5651675 + d316210
commit 4200166
Show file tree

Hide file tree

Showing 11 changed files with 518 additions and 520 deletions.
diff --git a/bgpd/bgp_debug.c b/bgpd/bgp_debug.c
@@ -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),

diff --git a/bgpd/bgp_debug.h b/bgpd/bgp_debug.h
@@ -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);
 

diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c
@@ -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,
@@ -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");