2004-05-08 Paul Jakma <paul@dishone.st>

       * 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 <sowmini.varadhan@sun.com>

       * 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}.

2 files changed, 11 insertions, 5 deletions

diff --git a/isisd/ChangeLog b/isisd/ChangeLog
index 60d5933f..810be798 100644
--- a/isisd/ChangeLog
+++ b/isisd/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-08 Paul Jakma <paul@dishone.st>
+
+	* isis_zebra.c: Sync with zclient changes.
+
 2004-02-11 Hasso Tepper <hasso@estpak.ee>
   * many *.c files: Replace thread_add_xxx() and thread_cancel() with
     THREAD_XXX_ON and THREAD_XXX_OFF macros.
diff --git a/isisd/isis_zebra.c b/isisd/isis_zebra.c
index 3b83e7a1..4b496c3a 100644
--- a/isisd/isis_zebra.c
+++ b/isisd/isis_zebra.c
@@ -171,7 +171,8 @@ isis_zebra_if_address_add (int command, struct zclient *zclient,
   struct prefix *p;
   u_char buf[BUFSIZ];
 
-  c = zebra_interface_address_add_read (zclient->ibuf);
+  c = zebra_interface_address_read (ZEBRA_INTERFACE_ADDRESS_ADD, 
+                                    zclient->ibuf);
   
   if (c == NULL)
     return 0;
@@ -199,7 +200,8 @@ isis_zebra_if_address_del (int command, struct zclient *client,
   struct connected *c;
   struct interface *ifp;
 
-  c = zebra_interface_address_delete_read (zclient->ibuf);
+  c = zebra_interface_address_read (ZEBRA_INTERFACE_ADDRESS_DELETE, 
+                                    zclient->ibuf);
   
   if (c == NULL)
     return 0;
@@ -293,7 +295,7 @@ isis_zebra_route_del_ipv4 (struct prefix *prefix,
     prefix4.family = AF_INET;
     prefix4.prefixlen = prefix->prefixlen;
     prefix4.prefix = prefix->u.prefix4;
-    zapi_ipv4_delete (zclient, &prefix4, &api);
+    zapi_ipv4_route (ZEBRA_IPV4_ROUTE_DELETE, zclient, &prefix4, &api);
   }
   
   return;
@@ -370,7 +372,7 @@ isis_zebra_route_add_ipv6 (struct prefix *prefix,
     prefix6.family = AF_INET6;
     prefix6.prefixlen = prefix->prefixlen;
     memcpy (&prefix6.prefix, &prefix->u.prefix6, sizeof (struct in6_addr));
-    zapi_ipv6_add (zclient, &prefix6, &api);
+    zapi_ipv6_route (ZEBRA_IPV6_ROUTE_ADD, zclient, &prefix6, &api);
     SET_FLAG (route_info->flag, ISIS_ROUTE_FLAG_ZEBRA_SYNC);
   }
   
@@ -444,7 +446,7 @@ isis_zebra_route_del_ipv6 (struct prefix *prefix,
     prefix6.family = AF_INET6;
     prefix6.prefixlen = prefix->prefixlen;
     memcpy (&prefix6.prefix, &prefix->u.prefix6, sizeof (struct in6_addr));
-    zapi_ipv6_delete (zclient, &prefix6, &api);
+    zapi_ipv6_route (ZEBRA_IPV6_ROUTE_DELETE, zclient, &prefix6, &api);
     UNSET_FLAG (route_info->flag, ISIS_ROUTE_FLAG_ZEBRA_SYNC);
   }