sharpd: Allow the registration of import checks to zebra

Minor code modification to allow the sharp_zebra.c code
to differentiate between import check or nexthop watch
types.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/sharpd/sharp_vty.c b/sharpd/sharp_vty.c
index 0c02bd304dcda3e100a58fa794c10c129163757d..26ce7c73bc07f1a0d6e0bed559f9cb07783df443 100644 (file)
--- a/sharpd/sharp_vty.c
+++ b/sharpd/sharp_vty.c
@@ -55,7 +55,7 @@ DEFPY(watch_nexthop_v6, watch_nexthop_v6_cmd,
        p.family = AF_INET6;
 
        sharp_nh_tracker_get(&p);
-       sharp_zebra_nexthop_watch(&p, true, !!connected);
+       sharp_zebra_nexthop_watch(&p, false, true, !!connected);
 
        return CMD_SUCCESS;
 }
@@ -77,7 +77,7 @@ DEFPY(watch_nexthop_v4, watch_nexthop_v4_cmd,
        p.family = AF_INET;
 
        sharp_nh_tracker_get(&p);
-       sharp_zebra_nexthop_watch(&p, true, !!connected);
+       sharp_zebra_nexthop_watch(&p, false, true, !!connected);
 
        return CMD_SUCCESS;
 }

diff --git a/sharpd/sharp_zebra.c b/sharpd/sharp_zebra.c
index 30e616a05775a6b127e5f4b9254314abf47e4b03..4682dbc73a4fd3e4e73602d880b9ef7765eb92b2 100644 (file)
--- a/sharpd/sharp_zebra.c
+++ b/sharpd/sharp_zebra.c
@@ -320,12 +320,22 @@ void route_delete(struct prefix *p, uint8_t instance)
        return;
 }
 
-void sharp_zebra_nexthop_watch(struct prefix *p, bool watch, bool connected)
+void sharp_zebra_nexthop_watch(struct prefix *p, bool import,
+                              bool watch, bool connected)
 {
-       int command = ZEBRA_NEXTHOP_REGISTER;
+       int command;
 
-       if (!watch)
-               command = ZEBRA_NEXTHOP_UNREGISTER;
+       if (!import) {
+               command = ZEBRA_NEXTHOP_REGISTER;
+
+               if (!watch)
+                       command = ZEBRA_NEXTHOP_UNREGISTER;
+       } else {
+               command = ZEBRA_IMPORT_ROUTE_REGISTER;
+
+               if (!watch)
+                       command = ZEBRA_IMPORT_ROUTE_UNREGISTER;
+       }
 
        if (zclient_send_rnh(zclient, command, p, connected, VRF_DEFAULT) < 0)
                zlog_warn("%s: Failure to send nexthop to zebra",
@@ -405,4 +415,5 @@ void sharp_zebra_init(void)
        zclient->interface_address_delete = interface_address_delete;
        zclient->route_notify_owner = route_notify_owner;
        zclient->nexthop_update = sharp_nexthop_update;
+       zclient->import_check_update = sharp_nexthop_update;
 }

diff --git a/sharpd/sharp_zebra.h b/sharpd/sharp_zebra.h
index 7e6ac7670bd9ad5c5aa0a3d503717974528b9272..b219022f028cd481d6afb296806589705da5d685 100644 (file)
--- a/sharpd/sharp_zebra.h
+++ b/sharpd/sharp_zebra.h
@@ -28,8 +28,8 @@ extern void vrf_label_add(vrf_id_t vrf_id, afi_t afi, mpls_label_t label);
 extern void route_add(struct prefix *p, uint8_t instance,
                      struct nexthop_group *nhg);
 extern void route_delete(struct prefix *p, uint8_t instance);
-extern void sharp_zebra_nexthop_watch(struct prefix *p, bool watch,
-                                     bool connected);
+extern void sharp_zebra_nexthop_watch(struct prefix *p, bool import,
+                                     bool watch, bool connected);
 
 extern void sharp_install_routes_helper(struct prefix *p, uint8_t instance,
                                         struct nexthop_group *nhg,