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}. --- ospf6d/ChangeLog | 4 ++++ ospf6d/ospf6_zebra.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'ospf6d') diff --git a/ospf6d/ChangeLog b/ospf6d/ChangeLog index f792596e..0e9d7fc6 100644 --- a/ospf6d/ChangeLog +++ b/ospf6d/ChangeLog @@ -1,3 +1,7 @@ +2004-05-08 Paul Jakma + + * ospf6_zebra.c: Sync to zclient changes + 2003-08-11 Taisuke Sasaki * ospf6_ism.c: DR Election bug fix. diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c index 347ba1cf..4e8815f3 100644 --- a/ospf6d/ospf6_zebra.c +++ b/ospf6d/ospf6_zebra.c @@ -138,7 +138,7 @@ ospf6_zebra_if_address_update_add (int command, struct zclient *zclient, struct connected *c; char buf[128]; - c = zebra_interface_address_add_read (zclient->ibuf); + c = zebra_interface_address_read (ZEBRA_INTERFACE_ADDRESS_ADD, zclient->ibuf); if (c == NULL) return 0; @@ -161,7 +161,7 @@ ospf6_zebra_if_address_update_delete (int command, struct zclient *zclient, struct connected *c; char buf[128]; - c = zebra_interface_address_delete_read (zclient->ibuf); + c = zebra_interface_address_read (ZEBRA_INTERFACE_ADDRESS_DELETE, zclient->ibuf); if (c == NULL) return 0; @@ -568,12 +568,12 @@ ospf6_zebra_route_update (int type, struct ospf6_route_req *request) p = (struct prefix_ipv6 *) &request->route.prefix; if (type == REMOVE && nexthop_list->count == 1) - ret = zapi_ipv6_delete (zclient, p, &api); + ret = zapi_ipv6_route (ZEBRA_IPV6_ROUTE_DELETE, zclient, p, &api); else - ret = zapi_ipv6_add (zclient, p, &api); + ret = zapi_ipv6_route (ZEBRA_IPV6_ROUTE_ADD, zclient, p, &api); if (ret < 0) - zlog_err ("ZEBRA: zapi_ipv6_add () failed: %s", strerror (errno)); + zlog_err ("ZEBRA: zapi_ipv6_route () failed: %s", strerror (errno)); for (linklist_head (nexthop_list, &node); !linklist_end (&node); linklist_next (&node)) -- cgit v1.2.1