From 7f88f54a83024a9e48ac9764baa6ee7e9e98bbce Mon Sep 17 00:00:00 2001 From: Lou Berger Date: Sat, 28 Oct 2017 15:03:34 -0400 Subject: [PATCH] bgpd: rfapi - don't do debug related work when debug not enabled and other minor tweaks Signed-off-by: Lou Berger --- bgpd/rfapi/rfapi_import.c | 3 --- bgpd/rfapi/vnc_export_bgp.c | 2 +- bgpd/rfapi/vnc_import_bgp.c | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/bgpd/rfapi/rfapi_import.c b/bgpd/rfapi/rfapi_import.c index 894bdad767..cdbc88c967 100644 --- a/bgpd/rfapi/rfapi_import.c +++ b/bgpd/rfapi/rfapi_import.c @@ -3973,9 +3973,6 @@ void rfapiProcessUpdate(struct peer *peer, if (safi == SAFI_MPLS_VPN) { vnc_direct_bgp_rh_add_route(bgp, afi, p, peer, attr); - } - - if (safi == SAFI_MPLS_VPN) { rfapiBgpInfoFilteredImportVPN( bgp->rfapi->it_ce, FIF_ACTION_UPDATE, peer, rfd, p, /* prefix */ diff --git a/bgpd/rfapi/vnc_export_bgp.c b/bgpd/rfapi/vnc_export_bgp.c index 50cd42bf79..268adcbfde 100644 --- a/bgpd/rfapi/vnc_export_bgp.c +++ b/bgpd/rfapi/vnc_export_bgp.c @@ -643,7 +643,7 @@ encap_attr_export(struct attr *new, struct attr *orig, if (rn) { ecom_ro = vnc_route_origin_ecom(rn); } else { - /* TBD test/assert for IPv6 */ + /* TBD use lcom for IPv6 */ ecom_ro = vnc_route_origin_ecom_single(&use_nexthop->u.prefix4); } if (new->ecommunity) { diff --git a/bgpd/rfapi/vnc_import_bgp.c b/bgpd/rfapi/vnc_import_bgp.c index 4122ae5a9f..05fbd18056 100644 --- a/bgpd/rfapi/vnc_import_bgp.c +++ b/bgpd/rfapi/vnc_import_bgp.c @@ -573,7 +573,7 @@ static void vnc_import_bgp_add_route_mode_resolve_nve( struct bgp_node *bnp; /* prd table node */ /*debugging */ - { + if (VNC_DEBUG(VERBOSE)) { char str_pfx[BUFSIZ]; char str_nh[BUFSIZ]; struct prefix nh; @@ -2637,7 +2637,7 @@ void vnc_import_bgp_add_route(struct bgp *bgp, struct prefix *prefix, { afi_t afi = family2afi(prefix->family); - { + if (VNC_DEBUG(VERBOSE)) { struct prefix pfx_nexthop; char buf[BUFSIZ]; char buf_nh[BUFSIZ]; -- 2.39.5