From 0a5893596774554f039222c481d235de0f35d99e Mon Sep 17 00:00:00 2001 From: paul Date: Sat, 8 May 2004 11:48:26 +0000 Subject: 2004-05-08 Paul Jakma * bgp_zebra.c: (bgp_interface_address_add) sync to zclient changes (bgp_interface_address_delete) ditto. (bgp_zebra_announce) ditto. (bgp_zebra_withdraw) ditto. * isis_zebra.c: Sync with zclient changes. * zclient.c (zapi_ipv4_route) Follow Sowmini's lead and describe message format. * ospf6_zebra.c: Sync to zclient changes * ospf_zebra.c: Sync with lib/zclient changes * rip_zebra.c: sync with zclient changes. * rip_interface.c: ditto. * ripng_{interface,zebra}.c: sync with zclient changes 2004-05-08 Sowmini Varadhan * zclient.c: (zapi_ipv4_add) collapsed into zapi_ipv4_route (zapi_ipv4_delete) ditto. (zapi_ipv4_route) add/delete a route by way of cmd arg. (zapi_ipv6_add) collapsed into zapi_ipv6_route. (zapi_ipv6_delete) ditto. (zapi_ipv6_route) add/delete a route by way of cmd arg. (zebra_interface_address_delete_read) collapsed into zebra_interface_address_read. (zebra_interface_address_delete_read) ditto. (zebra_interface_address_read) read address add/delete messages by way of type argument. Describe command message format. (zebra_interface_add_read) Unconditionally read new ifmtu6 field. Describe command message format. (zebra_interface_state_read) Unconditionally read new ifmtu6 field. (zclient_redistribute_set) Collapsed into zclient_redistribute (zclient_redistribute_unset) ditto (zclient_redistribute) set/unset redistribution. (zclient_redistribute_default_set) Collapsed into zclient_redistribute_default. (zclient_redistribute_default_unset) ditto. (zclient_redistribute_default) Redistribute default set/unset. * zclient.h: delete zapi_ipv{4,6}_add, zapi_ipv{4,6}_delete. Add zapi_ipv{4,6}_route. delete zclient_redistribute_set/unset. Add zclient_redistribute. Ditto for zclient_redistribute_default_{set/unset}. --- ripngd/ChangeLog | 4 ++++ ripngd/ripng_interface.c | 6 ++++-- ripngd/ripng_zebra.c | 12 ++++++------ 3 files changed, 14 insertions(+), 8 deletions(-) (limited to 'ripngd') diff --git a/ripngd/ChangeLog b/ripngd/ChangeLog index f5a30787..01256bbb 100644 --- a/ripngd/ChangeLog +++ b/ripngd/ChangeLog @@ -1,3 +1,7 @@ +2004-05-08 Paul Jakma + + * ripng_{interface,zebra}.c: sync with zclient changes + 2004-01-03 Greg Troxel * ripng_interface.c (ripng_multicast_join): If IPV6_JOIN_GROUP diff --git a/ripngd/ripng_interface.c b/ripngd/ripng_interface.c index 7437f70f..28977bea 100644 --- a/ripngd/ripng_interface.c +++ b/ripngd/ripng_interface.c @@ -411,7 +411,8 @@ ripng_interface_address_add (int command, struct zclient *zclient, struct connected *c; struct prefix *p; - c = zebra_interface_address_add_read (zclient->ibuf); + c = zebra_interface_address_read (ZEBRA_INTERFACE_ADDRESS_ADD, + zclient->ibuf); if (c == NULL) return 0; @@ -480,7 +481,8 @@ ripng_interface_address_delete (int command, struct zclient *zclient, struct prefix *p; char buf[INET6_ADDRSTRLEN]; - ifc = zebra_interface_address_delete_read (zclient->ibuf); + ifc = zebra_interface_address_read (ZEBRA_INTERFACE_ADDRESS_DELETE, + zclient->ibuf); if (ifc) { diff --git a/ripngd/ripng_zebra.c b/ripngd/ripng_zebra.c index de372dcb..45ba2130 100644 --- a/ripngd/ripng_zebra.c +++ b/ripngd/ripng_zebra.c @@ -60,7 +60,7 @@ ripng_zebra_ipv6_add (struct prefix_ipv6 *p, struct in6_addr *nexthop, api.ifindex_num = 1; api.ifindex = &ifindex; - zapi_ipv6_add (zclient, p, &api); + zapi_ipv6_route (ZEBRA_IPV6_ROUTE_ADD, zclient, p, &api); } } @@ -82,7 +82,7 @@ ripng_zebra_ipv6_delete (struct prefix_ipv6 *p, struct in6_addr *nexthop, api.ifindex_num = 1; api.ifindex = &ifindex; - zapi_ipv6_delete (zclient, p, &api); + zapi_ipv6_route (ZEBRA_IPV6_ROUTE_DELETE, zclient, p, &api); } } @@ -300,7 +300,7 @@ DEFUN (ripng_redistribute_type, if (strncmp (redist_type[i].str, argv[0], redist_type[i].str_min_len) == 0) { - zclient_redistribute_set (zclient, redist_type[i].type); + zclient_redistribute (ZEBRA_REDISTRIBUTE_ADD, zclient, redist_type[i].type); return CMD_SUCCESS; } } @@ -364,7 +364,7 @@ DEFUN (ripng_redistribute_type_metric, redist_type[i].str_min_len) == 0) { ripng_redistribute_metric_set (redist_type[i].type, metric); - zclient_redistribute_set (zclient, redist_type[i].type); + zclient_redistribute (ZEBRA_REDISTRIBUTE_ADD, zclient, redist_type[i].type); return CMD_SUCCESS; } } @@ -407,7 +407,7 @@ DEFUN (ripng_redistribute_type_routemap, redist_type[i].str_min_len) == 0) { ripng_redistribute_routemap_set (redist_type[i].type, argv[1]); - zclient_redistribute_set (zclient, redist_type[i].type); + zclient_redistribute (ZEBRA_REDISTRIBUTE_ADD, zclient, redist_type[i].type); return CMD_SUCCESS; } } @@ -456,7 +456,7 @@ DEFUN (ripng_redistribute_type_metric_routemap, { ripng_redistribute_metric_set (redist_type[i].type, metric); ripng_redistribute_routemap_set (redist_type[i].type, argv[2]); - zclient_redistribute_set (zclient, redist_type[i].type); + zclient_redistribute (ZEBRA_REDISTRIBUTE_ADD, zclient, redist_type[i].type); return CMD_SUCCESS; } } -- cgit v1.2.1