bgpd: rfapi - don't do debug related work when debug not

      enabled and other minor tweaks

Signed-off-by: Lou Berger <lberger@labn.net>

diff --git a/bgpd/rfapi/rfapi_import.c b/bgpd/rfapi/rfapi_import.c
index 894bdad767e569a6ad089b14532bb6445ec6ee9d..cdbc88c967ad47115fef733f0a2cfaf30f4e3ad7 100644 (file)
--- 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 50cd42bf79ca6e1be6e83893e3deb677e785144c..268adcbfde72a805a9a071546b8d850e99b348f7 100644 (file)
--- 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 4122ae5a9f657492122bb97cef2ff117c65dc88c..05fbd180560dccb5f0127a878fc028b6a55b0580 100644 (file)
--- 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];