]> git.puffer.fish Git - mirror/frr.git/commitdiff
*: make failure to decode nht update an error
authorQuentin Young <qlyoung@nvidia.com>
Wed, 30 Sep 2020 22:37:15 +0000 (18:37 -0400)
committerIgor Ryzhov <iryzhov@nfware.com>
Wed, 7 Oct 2020 08:01:16 +0000 (11:01 +0300)
This should never happen; no need to debug guard it and it's not a
warning, if this isn't working then NHT is not working at all.

Signed-off-by: Quentin Young <qlyoung@nvidia.com>
bgpd/bgp_nht.c
pbrd/pbr_zebra.c
pimd/pim_nht.c
sharpd/sharp_zebra.c
staticd/static_zebra.c

index 9573d118e5a774fd06f138829800d32be523d8a2..e10842c58533322fa6e7839db26d8b82ea2e346e 100644 (file)
@@ -441,9 +441,8 @@ void bgp_parse_nexthop_update(int command, vrf_id_t vrf_id)
        }
 
        if (!zapi_nexthop_update_decode(zclient->ibuf, &nhr)) {
-               if (BGP_DEBUG(nht, NHT))
-                       zlog_debug("%s[%s]: Failure to decode nexthop update",
-                                  __PRETTY_FUNCTION__, bgp->name_pretty);
+               zlog_err("%s[%s]: Failure to decode nexthop update",
+                        __PRETTY_FUNCTION__, bgp->name_pretty);
                return;
        }
 
index 8ef675186f21c0d6f51ceecc66368a95d0af1b6a..866f27136eeaaa1e368341a1c481adcde8e0f873 100644 (file)
@@ -401,7 +401,7 @@ static int pbr_zebra_nexthop_update(ZAPI_CALLBACK_ARGS)
        uint32_t i;
 
        if (!zapi_nexthop_update_decode(zclient->ibuf, &nhr)) {
-               zlog_warn("Failure to decode Nexthop update message");
+               zlog_err("Failure to decode Nexthop update message");
                return 0;
        }
 
index a888d68f0996ecbf6276c037ed5b345306c7d559..f06d4ae6054140029cec10b96b49935d2f83cc7c 100644 (file)
@@ -735,10 +735,8 @@ int pim_parse_nexthop_update(ZAPI_CALLBACK_ARGS)
        pim = vrf->info;
 
        if (!zapi_nexthop_update_decode(zclient->ibuf, &nhr)) {
-               if (PIM_DEBUG_PIM_NHT)
-                       zlog_debug(
-                               "%s: Decode of nexthop update from zebra failed",
-                               __func__);
+               zlog_err("%s: Decode of nexthop update from zebra failed",
+                        __func__);
                return 0;
        }
 
index 08f5a07b7e91ed06892654c6e89bce67916ee979..208e0ae30fd77591065ccd673db8442c28571d48 100644 (file)
@@ -491,8 +491,7 @@ static int sharp_nexthop_update(ZAPI_CALLBACK_ARGS)
        struct zapi_route nhr;
 
        if (!zapi_nexthop_update_decode(zclient->ibuf, &nhr)) {
-               zlog_warn("%s: Decode of update failed", __func__);
-
+               zlog_err("%s: Decode of update failed", __func__);
                return 0;
        }
 
index 1bdbb69d00ad2a987c7b10f383d60cf07a7c2d90..57903daaedf47a41508d4b8014970f549ee395db 100644 (file)
@@ -184,7 +184,7 @@ static int static_zebra_nexthop_update(ZAPI_CALLBACK_ARGS)
        afi_t afi = AFI_IP;
 
        if (!zapi_nexthop_update_decode(zclient->ibuf, &nhr)) {
-               zlog_warn("Failure to decode nexthop update message");
+               zlog_err("Failure to decode nexthop update message");
                return 1;
        }