summaryrefslogtreecommitdiffstats
path: root/sharpd
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@nvidia.com>2021-09-24 16:32:30 +0200
committerDonald Sharp <sharpd@nvidia.com>2021-09-27 18:38:08 +0200
commit3d174ce08db7489e2424ac16f35557c9627c75e0 (patch)
tree699c167065fe54bdabe4a3e7d83e8f7247741ed1 /sharpd
parentospf6d: Make ospfv3 use normal address resolution instead of import route (diff)
downloadfrr-3d174ce08db7489e2424ac16f35557c9627c75e0.tar.xz
frr-3d174ce08db7489e2424ac16f35557c9627c75e0.zip
*: Remove the ZEBRA_IMPORT_ROUTE_XXX zapi messages
These are no longer really needed. The client just needs to call nexthop resolution instead. So let's remove the zapi types. Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'sharpd')
-rw-r--r--sharpd/sharp_zebra.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/sharpd/sharp_zebra.c b/sharpd/sharp_zebra.c
index 48c9e8ced..67cff378e 100644
--- a/sharpd/sharp_zebra.c
+++ b/sharpd/sharp_zebra.c
@@ -626,17 +626,10 @@ void sharp_zebra_nexthop_watch(struct prefix *p, vrf_id_t vrf_id, bool import,
{
int command;
- if (!import) {
- command = ZEBRA_NEXTHOP_REGISTER;
+ command = ZEBRA_NEXTHOP_REGISTER;
- if (!watch)
- command = ZEBRA_NEXTHOP_UNREGISTER;
- } else {
- command = ZEBRA_IMPORT_ROUTE_REGISTER;
-
- if (!watch)
- command = ZEBRA_IMPORT_ROUTE_UNREGISTER;
- }
+ if (!watch)
+ command = ZEBRA_NEXTHOP_UNREGISTER;
if (zclient_send_rnh(zclient, command, p, connected, false, vrf_id)
== ZCLIENT_SEND_FAILURE)
@@ -984,7 +977,6 @@ 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;
zclient->nhg_notify_owner = nhg_notify_owner;
zclient->zebra_buffer_write_ready = sharp_zclient_buffer_ready;
zclient->redistribute_route_add = sharp_redistribute_route;