bgpd: rfapi - fix a couple of check that should have been against RD len vs RD type...

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

diff --git a/bgpd/rfapi/bgp_rfapi_cfg.c b/bgpd/rfapi/bgp_rfapi_cfg.c
index a39fe068bd8a18db9a3f20866175224ab1b12f30..91a3744315e18f24a03a4ef54da8f0fbcef7a245 100644 (file)
--- a/bgpd/rfapi/bgp_rfapi_cfg.c
+++ b/bgpd/rfapi/bgp_rfapi_cfg.c
@@ -4093,7 +4093,7 @@ int bgp_rfapi_cfg_write(struct vty *vty, struct bgp *bgp)
                        }
                }
 
-               if (hc->default_rd.family || hc->default_response_lifetime
+               if (hc->default_rd.prefixlen || hc->default_response_lifetime
                    || hc->default_rt_import_list || hc->default_rt_export_list
                    || hc->nve_groups_sequential->count) {
 

diff --git a/bgpd/rfapi/rfapi_vty.c b/bgpd/rfapi/rfapi_vty.c
index e7314d29834d2f661e3a501d8214041116b4f409..8d1b2b974e65b2ca0ed0f65ee510ed490bf1b5c5 100644 (file)
--- a/bgpd/rfapi/rfapi_vty.c
+++ b/bgpd/rfapi/rfapi_vty.c
@@ -4671,7 +4671,7 @@ static int vnc_add_vrf_prefix(struct vty *vty, const char *arg_vrf,
                        arg_vrf);
                return CMD_WARNING_CONFIG_FAILED;
        }
-       if (!rfg->rd.family && !arg_rd) {
+       if (!rfg->rd.prefixlen && !arg_rd) {
                vty_out(vty,
                        "VRF \"%s\" isn't configured with an RD, so RD must be provided.\n",
                        arg_vrf);