proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-21 15:32:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #154 from LabNConsulting/working/master/patch-set/rr-part2

Browse Source 
Mater: complete Issue#91 fix (regression now clean)
This commit is contained in:
Donald Sharp 2017-02-02 07:49:43 -05:00 committed by GitHub
commit c909b82ae6
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bgpd/bgp_route.c
View File

@ -2832,6 +2832,17 @@ bgp_update (struct peer *peer, struct prefix *p, u_int32_t addpath_id,
bgp_unlock_node (rn); bgp_unlock_node (rn);
#if ENABLE_BGP_VNC
/*
* Filtered update is treated as an implicit withdrawal (see bgp_rib_remove()
* a few lines above)
*/
if ((SAFI_MPLS_VPN == safi) || (SAFI_ENCAP == safi))
{
rfapiProcessWithdraw(peer, NULL, p, prd, NULL, afi, safi, type, 0);
}
#endif
return 0; return 0;
} }

6
bgpd/rfapi/rfapi.c
View File

@ -1724,11 +1724,17 @@ rfapi_query_inner (
{ {
char buf[BUFSIZ]; char buf[BUFSIZ];
char *s;
prefix2str (&p, buf, BUFSIZ); prefix2str (&p, buf, BUFSIZ);
buf[BUFSIZ - 1] = 0; /* guarantee NUL-terminated */ buf[BUFSIZ - 1] = 0; /* guarantee NUL-terminated */
vnc_zlog_debug_verbose ("%s(rfd=%p, target=%s, ppNextHop=%p)", vnc_zlog_debug_verbose ("%s(rfd=%p, target=%s, ppNextHop=%p)",
__func__, rfd, buf, ppNextHopEntry); __func__, rfd, buf, ppNextHopEntry);
s = ecommunity_ecom2str(rfd->import_table->rt_import_list,
ECOMMUNITY_FORMAT_ROUTE_MAP);
vnc_zlog_debug_verbose("%s rfd->import_table=%p, rfd->import_table->rt_import_list: %s",
__func__, rfd->import_table, s); XFREE (MTYPE_ECOMMUNITY_STR, s);
} }
afi = family2afi (p.family); afi = family2afi (p.family);

4
bgpd/rfapi/rfapi_vty.c
View File

@ -57,6 +57,7 @@
#include "bgpd/rfapi/vnc_debug.h" #include "bgpd/rfapi/vnc_debug.h"
#define DEBUG_L2_EXTRA 0 #define DEBUG_L2_EXTRA 0
#define DEBUG_SHOW_EXTRA 0
#define VNC_SHOW_STR "VNC information\n" #define VNC_SHOW_STR "VNC information\n"
@ -1520,6 +1521,9 @@ rfapiShowRemoteRegistrationsIt (
fp (out, "Displayed %d out of %d %s%s", fp (out, "Displayed %d out of %d %s%s",
printed, total, type, HVTY_NEWLINE); printed, total, type, HVTY_NEWLINE);
#if DEBUG_SHOW_EXTRA
fp(out, "IT table above: it=%p%s", it, HVTY_NEWLINE);
#endif
} }
return printed; return printed;
} }