Merge pull request #1789 from Orange-OpenSource/master

[mirror_frr.git] / ospfd / ospf_sr.c

diff --git a/ospfd/ospf_sr.c b/ospfd/ospf_sr.c
index 2944c8b09aa3497a10ed855f2522fa71f5071e05..fef77f574e1c31907568c3193de50922dbc48856 100644 (file)
--- a/ospfd/ospf_sr.c
+++ b/ospfd/ospf_sr.c
@@ -307,7 +307,8 @@ int ospf_sr_init(void)
 {
        int rc = -1;
 
-       zlog_info("SR (%s): Initialize SR Data Base", __func__);
+       if (IS_DEBUG_OSPF_SR)
+               zlog_info("SR (%s): Initialize SR Data Base", __func__);
 
        memset(&OspfSR, 0, sizeof(struct ospf_sr_db));
        OspfSR.enabled = false;
@@ -676,6 +677,7 @@ static int ospf_zebra_send_mpls_ftn(int cmd, struct sr_nhlfe nhlfe)
                SET_FLAG(api.message, ZAPI_MESSAGE_LABEL);
                api_nh->labels[0] = nhlfe.label_out;
                api_nh->label_num = 1;
+               api_nh->vrf_id = VRF_DEFAULT;
                api.nexthop_num = 1;
        }
 
@@ -1617,11 +1619,11 @@ static int ospf_sr_update_schedule(struct thread *t)
 
        monotime(&stop_time);
 
-       zlog_info(
-               "SR (%s): SPF Processing Time(usecs): %lld\n",
-               __func__,
-               (stop_time.tv_sec - start_time.tv_sec) * 1000000LL
-                       + (stop_time.tv_usec - start_time.tv_usec));
+       if (IS_DEBUG_OSPF_SR)
+               zlog_debug("SR (%s): SPF Processing Time(usecs): %lld\n",
+                          __func__,
+                          (stop_time.tv_sec - start_time.tv_sec) * 1000000LL
+                          + (stop_time.tv_usec - start_time.tv_usec));
 
        OspfSR.update = false;
        return 1;