rfapi: explicitly test against success of is_configured.

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

diff --git a/bgpd/rfapi/rfapi.c b/bgpd/rfapi/rfapi.c
index 6e31b6345178b6ed0c5efaf4a9c0f495ed5731f7..b093265ffb0473ac946311507ce82359a82c529b 100644 (file)
--- a/bgpd/rfapi/rfapi.c
+++ b/bgpd/rfapi/rfapi.c
@@ -122,7 +122,7 @@ int rfapi_get_response_lifetime_default(void *rfp_start_val)
 /*------------------------------------------
  * rfapi_is_vnc_configured
  *
- * Returns if VNC (BGP VPN messaging /VPN & encap SAFIs) are configured
+ * Returns if VNC is configured
  *
  * input:
  *    rfp_start_val     value returned by rfp_start or
@@ -137,7 +137,9 @@ int rfapi_get_response_lifetime_default(void *rfp_start_val)
 int rfapi_is_vnc_configured(void *rfp_start_val)
 {
        struct bgp *bgp = rfapi_bgp_lookup_by_rfp(rfp_start_val);
-       return bgp_rfapi_is_vnc_configured(bgp);
+       if (bgp_rfapi_is_vnc_configured(bgp) == 0)
+               return 0;
+       return ENXIO;
 }
 
 

diff --git a/bgpd/rfapi/rfapi.h b/bgpd/rfapi/rfapi.h
index 8eb0d717dfced12f1dcbc31332d9c5c7681f1ba6..6af2ebeeb8dc34c3d772b71036ca9505a62ced69 100644 (file)
--- a/bgpd/rfapi/rfapi.h
+++ b/bgpd/rfapi/rfapi.h
@@ -862,7 +862,7 @@ extern int rfapi_get_response_lifetime_default(void *rfp_start_val);
 /*------------------------------------------
  * rfapi_is_vnc_configured
  *
- * Returns if VNC (BGP VPN messaging /VPN & encap SAFIs) are configured
+ * Returns if VNC is configured
  *
  * input:
  *    rfp_start_val     value returned by rfp_start or

diff --git a/bgpd/rfapi/rfapi_vty.c b/bgpd/rfapi/rfapi_vty.c
index 7bfc8882e2dcc44665949251fc4b675285f63030..aa4d48932f71dd97a438de263d68a4463f5e9487 100644 (file)
--- a/bgpd/rfapi/rfapi_vty.c
+++ b/bgpd/rfapi/rfapi_vty.c
@@ -4074,12 +4074,12 @@ DEFUN (clear_vnc_mac_all_prefix,
 /* copied from rfp_vty.c */
 static int check_and_display_is_vnc_running(struct vty *vty)
 {
-       if (!bgp_rfapi_is_vnc_configured(NULL))
+       if (bgp_rfapi_is_vnc_configured(NULL) == 0)
                return 1; /* is running */
 
        if (vty) {
                vty_out(vty,
-                       "VNC is not configured. (There are no configured BGP VPN SAFI peers.)\n");
+                       "VNC is not configured.\n");
        }
        return 0; /* not running */
 }
@@ -4089,7 +4089,7 @@ static int rfapi_vty_show_nve_summary(struct vty *vty,
 {
        struct bgp *bgp_default = bgp_get_default();
        struct rfapi *h;
-       int is_vnc_running = !bgp_rfapi_is_vnc_configured(bgp_default);
+       int is_vnc_running = (bgp_rfapi_is_vnc_configured(bgp_default) == 0);
 
        int active_local_routes;
        int active_remote_routes;