diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c index c2df521e79..15db321557 100644 --- a/bgpd/bgp_zebra.c +++ b/bgpd/bgp_zebra.c @@ -2103,14 +2103,10 @@ bgp_zebra_init (struct thread_master *master) zclient->interface_nbr_address_add = bgp_interface_nbr_address_add; zclient->interface_nbr_address_delete = bgp_interface_nbr_address_delete; zclient->interface_vrf_update = bgp_interface_vrf_update; - zclient->ipv4_route_add = zebra_read_ipv4; - zclient->ipv4_route_delete = zebra_read_ipv4; zclient->redistribute_route_ipv4_add = zebra_read_ipv4; zclient->redistribute_route_ipv4_del = zebra_read_ipv4; zclient->interface_up = bgp_interface_up; zclient->interface_down = bgp_interface_down; - zclient->ipv6_route_add = zebra_read_ipv6; - zclient->ipv6_route_delete = zebra_read_ipv6; zclient->redistribute_route_ipv6_add = zebra_read_ipv6; zclient->redistribute_route_ipv6_del = zebra_read_ipv6; zclient->nexthop_update = bgp_read_nexthop_update; diff --git a/isisd/isis_zebra.c b/isisd/isis_zebra.c index 569ff70d8d..45728ad2c1 100644 --- a/isisd/isis_zebra.c +++ b/isisd/isis_zebra.c @@ -706,13 +706,9 @@ isis_zebra_init (struct thread_master *master) zclient->interface_address_add = isis_zebra_if_address_add; zclient->interface_address_delete = isis_zebra_if_address_del; zclient->interface_link_params = isis_zebra_link_params; - zclient->ipv4_route_add = isis_zebra_read_ipv4; - zclient->ipv4_route_delete = isis_zebra_read_ipv4; zclient->redistribute_route_ipv4_add = isis_zebra_read_ipv4; zclient->redistribute_route_ipv4_del = isis_zebra_read_ipv4; #ifdef HAVE_IPV6 - zclient->ipv6_route_add = isis_zebra_read_ipv6; - zclient->ipv6_route_delete = isis_zebra_read_ipv6; zclient->redistribute_route_ipv6_add = isis_zebra_read_ipv6; zclient->redistribute_route_ipv6_del = isis_zebra_read_ipv6; #endif /* HAVE_IPV6 */ diff --git a/ldpd/ldp_zebra.c b/ldpd/ldp_zebra.c index 6e19e4f607..1d443a6487 100644 --- a/ldpd/ldp_zebra.c +++ b/ldpd/ldp_zebra.c @@ -368,16 +368,12 @@ ldp_zebra_read_route(int command, struct zclient *zclient, zebra_size_t length, return (0); switch (command) { - case ZEBRA_IPV4_ROUTE_ADD: case ZEBRA_REDISTRIBUTE_IPV4_ADD: - case ZEBRA_IPV4_ROUTE_DELETE: case ZEBRA_REDISTRIBUTE_IPV4_DEL: kr.af = AF_INET; nhlen = sizeof(struct in_addr); break; - case ZEBRA_IPV6_ROUTE_ADD: case ZEBRA_REDISTRIBUTE_IPV6_ADD: - case ZEBRA_IPV6_ROUTE_DELETE: case ZEBRA_REDISTRIBUTE_IPV6_DEL: kr.af = AF_INET6; nhlen = sizeof(struct in6_addr); @@ -419,9 +415,7 @@ ldp_zebra_read_route(int command, struct zclient *zclient, zebra_size_t length, kr.ifindex = stream_getl(s); switch (command) { - case ZEBRA_IPV4_ROUTE_ADD: case ZEBRA_REDISTRIBUTE_IPV4_ADD: - case ZEBRA_IPV6_ROUTE_ADD: case ZEBRA_REDISTRIBUTE_IPV6_ADD: debug_zebra_in("route add %s/%d nexthop %s (%s)", log_addr(kr.af, &kr.prefix), kr.prefixlen, @@ -430,9 +424,7 @@ ldp_zebra_read_route(int command, struct zclient *zclient, zebra_size_t length, main_imsg_compose_lde(IMSG_NETWORK_ADD, 0, &kr, sizeof(kr)); break; - case ZEBRA_IPV4_ROUTE_DELETE: case ZEBRA_REDISTRIBUTE_IPV4_DEL: - case ZEBRA_IPV6_ROUTE_DELETE: case ZEBRA_REDISTRIBUTE_IPV6_DEL: debug_zebra_in("route delete %s/%d nexthop %s (%s)", log_addr(kr.af, &kr.prefix), kr.prefixlen, @@ -501,12 +493,8 @@ ldp_zebra_init(struct thread_master *master) zclient->interface_down = ldp_interface_status_change; zclient->interface_address_add = ldp_interface_address_add; zclient->interface_address_delete = ldp_interface_address_delete; - zclient->ipv4_route_add = ldp_zebra_read_route; - zclient->ipv4_route_delete = ldp_zebra_read_route; zclient->redistribute_route_ipv4_add = ldp_zebra_read_route; zclient->redistribute_route_ipv4_del = ldp_zebra_read_route; - zclient->ipv6_route_add = ldp_zebra_read_route; - zclient->ipv6_route_delete = ldp_zebra_read_route; zclient->redistribute_route_ipv6_add = ldp_zebra_read_route; zclient->redistribute_route_ipv6_del = ldp_zebra_read_route; } diff --git a/lib/zclient.c b/lib/zclient.c index 057fa77580..5193a282a6 100644 --- a/lib/zclient.c +++ b/lib/zclient.c @@ -1583,22 +1583,6 @@ zclient_read (struct thread *thread) if (zclient->interface_vrf_update) (*zclient->interface_vrf_update) (command, zclient, length, vrf_id); break; - case ZEBRA_IPV4_ROUTE_ADD: - if (zclient->ipv4_route_add) - (*zclient->ipv4_route_add) (command, zclient, length, vrf_id); - break; - case ZEBRA_IPV4_ROUTE_DELETE: - if (zclient->ipv4_route_delete) - (*zclient->ipv4_route_delete) (command, zclient, length, vrf_id); - break; - case ZEBRA_IPV6_ROUTE_ADD: - if (zclient->ipv6_route_add) - (*zclient->ipv6_route_add) (command, zclient, length, vrf_id); - break; - case ZEBRA_IPV6_ROUTE_DELETE: - if (zclient->ipv6_route_delete) - (*zclient->ipv6_route_delete) (command, zclient, length, vrf_id); - break; case ZEBRA_NEXTHOP_UPDATE: if (zclient_debug) zlog_debug("zclient rcvd nexthop update\n"); diff --git a/lib/zclient.h b/lib/zclient.h index b95d18ec1a..231b4e9b4f 100644 --- a/lib/zclient.h +++ b/lib/zclient.h @@ -98,10 +98,6 @@ struct zclient int (*interface_nbr_address_add) (int, struct zclient *, uint16_t, vrf_id_t); int (*interface_nbr_address_delete) (int, struct zclient *, uint16_t, vrf_id_t); int (*interface_vrf_update) (int, struct zclient *, uint16_t, vrf_id_t); - int (*ipv4_route_add) (int, struct zclient *, uint16_t, vrf_id_t); - int (*ipv4_route_delete) (int, struct zclient *, uint16_t, vrf_id_t); - int (*ipv6_route_add) (int, struct zclient *, uint16_t, vrf_id_t); - int (*ipv6_route_delete) (int, struct zclient *, uint16_t, vrf_id_t); int (*nexthop_update) (int, struct zclient *, uint16_t, vrf_id_t); int (*import_check_update) (int, struct zclient *, uint16_t, vrf_id_t); int (*bfd_dest_replay) (int, struct zclient *, uint16_t, vrf_id_t); diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c index 77ea01e53d..6dee1424a6 100644 --- a/ospf6d/ospf6_zebra.c +++ b/ospf6d/ospf6_zebra.c @@ -677,12 +677,8 @@ ospf6_zebra_init (struct thread_master *master) zclient->interface_down = ospf6_zebra_if_state_update; zclient->interface_address_add = ospf6_zebra_if_address_update_add; zclient->interface_address_delete = ospf6_zebra_if_address_update_delete; - zclient->ipv4_route_add = NULL; - zclient->ipv4_route_delete = NULL; zclient->redistribute_route_ipv4_add = NULL; zclient->redistribute_route_ipv4_del = NULL; - zclient->ipv6_route_add = ospf6_zebra_read_ipv6; - zclient->ipv6_route_delete = ospf6_zebra_read_ipv6; zclient->redistribute_route_ipv6_add = ospf6_zebra_read_ipv6; zclient->redistribute_route_ipv6_del = ospf6_zebra_read_ipv6; diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c index c0b94a3360..8752e83ed5 100644 --- a/ospfd/ospf_zebra.c +++ b/ospfd/ospf_zebra.c @@ -1601,8 +1601,6 @@ ospf_zebra_init (struct thread_master *master, u_short instance) zclient->interface_address_delete = ospf_interface_address_delete; zclient->interface_link_params = ospf_interface_link_params; - zclient->ipv4_route_add = ospf_zebra_read_ipv4; - zclient->ipv4_route_delete = ospf_zebra_read_ipv4; zclient->redistribute_route_ipv4_add = ospf_zebra_read_ipv4; zclient->redistribute_route_ipv4_del = ospf_zebra_read_ipv4; diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c index d357e5cc83..b25e8b94da 100644 --- a/pimd/pim_zebra.c +++ b/pimd/pim_zebra.c @@ -616,7 +616,6 @@ static int redist_read_ipv4_route(int command, struct zclient *zclient, switch (command) { case ZEBRA_REDISTRIBUTE_IPV4_ADD: - case ZEBRA_IPV4_ROUTE_ADD: if (PIM_DEBUG_ZEBRA) { char buf[2][INET_ADDRSTRLEN]; zlog_debug("%s: add %s %s/%d " @@ -634,7 +633,6 @@ static int redist_read_ipv4_route(int command, struct zclient *zclient, } break; case ZEBRA_REDISTRIBUTE_IPV4_DEL: - case ZEBRA_IPV4_ROUTE_DELETE: if (PIM_DEBUG_ZEBRA) { char buf[2][INET_ADDRSTRLEN]; zlog_debug("%s: delete %s %s/%d " @@ -690,8 +688,6 @@ void pim_zebra_init(char *zebra_sock_path) qpim_zclient_update->interface_down = pim_zebra_if_state_down; qpim_zclient_update->interface_address_add = pim_zebra_if_address_add; qpim_zclient_update->interface_address_delete = pim_zebra_if_address_del; - qpim_zclient_update->ipv4_route_add = redist_read_ipv4_route; - qpim_zclient_update->ipv4_route_delete = redist_read_ipv4_route; qpim_zclient_update->redistribute_route_ipv4_add = redist_read_ipv4_route; qpim_zclient_update->redistribute_route_ipv4_del = redist_read_ipv4_route; diff --git a/ripd/rip_zebra.c b/ripd/rip_zebra.c index 6ca27d01dd..c312641d44 100644 --- a/ripd/rip_zebra.c +++ b/ripd/rip_zebra.c @@ -723,8 +723,6 @@ rip_zclient_init (struct thread_master *master) zclient->interface_delete = rip_interface_delete; zclient->interface_address_add = rip_interface_address_add; zclient->interface_address_delete = rip_interface_address_delete; - zclient->ipv4_route_add = rip_zebra_read_ipv4; - zclient->ipv4_route_delete = rip_zebra_read_ipv4; zclient->interface_up = rip_interface_up; zclient->interface_down = rip_interface_down; zclient->redistribute_route_ipv4_add = rip_zebra_read_ipv4; diff --git a/ripngd/ripng_zebra.c b/ripngd/ripng_zebra.c index d8667cb68c..1184cd0db6 100644 --- a/ripngd/ripng_zebra.c +++ b/ripngd/ripng_zebra.c @@ -557,12 +557,6 @@ zebra_init (struct thread_master *master) zclient->interface_delete = ripng_interface_delete; zclient->interface_address_add = ripng_interface_address_add; zclient->interface_address_delete = ripng_interface_address_delete; - zclient->ipv4_route_add = NULL; - zclient->ipv4_route_delete = NULL; - zclient->redistribute_route_ipv4_add = NULL; - zclient->redistribute_route_ipv4_del = NULL; - zclient->ipv6_route_add = ripng_zebra_read_ipv6; - zclient->ipv6_route_delete = ripng_zebra_read_ipv6; zclient->redistribute_route_ipv6_add = ripng_zebra_read_ipv6; zclient->redistribute_route_ipv6_del = ripng_zebra_read_ipv6;