ospf6d: use the new API to send routes to zebra

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>

diff --git a/ospf6d/ospf6_route.c b/ospf6d/ospf6_route.c
index bfe583a91149755bf16139c025659e5d9a06120e..03791ad7a07616387e1824181d2fc7c0e609886a 100644 (file)
--- a/ospf6d/ospf6_route.c
+++ b/ospf6d/ospf6_route.c
@@ -285,8 +285,7 @@ void ospf6_add_nexthop(struct list *nh_list, int ifindex, struct in6_addr *addr)
 }
 
 void ospf6_route_zebra_copy_nexthops(struct ospf6_route *route,
-                                    ifindex_t *ifindexes,
-                                    struct in6_addr **nexthop_addr,
+                                    struct zapi_nexthop nexthops[],
                                     int entries)
 {
        struct ospf6_nexthop *nh;
@@ -307,8 +306,9 @@ void ospf6_route_zebra_copy_nexthops(struct ospf6_route *route,
                                           IFNAMSIZ, ifname, nh->ifindex);
                        }
                        if (i < entries) {
-                               nexthop_addr[i] = &nh->address;
-                               ifindexes[i] = nh->ifindex;
+                               nexthops[i].gate.ipv6 = nh->address;
+                               nexthops[i].ifindex = nh->ifindex;
+                               nexthops[i].type = NEXTHOP_TYPE_IPV6_IFINDEX;
                                i++;
                        } else {
                                return;

diff --git a/ospf6d/ospf6_route.h b/ospf6d/ospf6_route.h
index 166074fb705c5c2d239dac829eb5a07cf8f6d2d8..9eacadbdb7dee68e0254b84230965d369beb1b72 100644 (file)
--- a/ospf6d/ospf6_route.h
+++ b/ospf6d/ospf6_route.h
@@ -22,6 +22,7 @@
 #define OSPF6_ROUTE_H
 
 #include "command.h"
+#include "zclient.h"
 
 #define OSPF6_MULTI_PATH_LIMIT    4
 
@@ -266,8 +267,7 @@ extern int ospf6_num_nexthops(struct list *nh_list);
 extern int ospf6_route_cmp_nexthops(struct ospf6_route *a,
                                    struct ospf6_route *b);
 extern void ospf6_route_zebra_copy_nexthops(struct ospf6_route *route,
-                                           ifindex_t *ifindices,
-                                           struct in6_addr **addr,
+                                           struct zapi_nexthop nexthops[],
                                            int entries);
 extern int ospf6_route_get_first_nh_index(struct ospf6_route *route);
 

diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c
index 1c266da888bfbb00683f74887c965fb7be833daa..565550287963986665fe5742160d8506be9b3b07 100644 (file)
--- a/ospf6d/ospf6_zebra.c
+++ b/ospf6d/ospf6_zebra.c
@@ -333,13 +333,11 @@ DEFUN (show_zebra,
 #define REM    1
 static void ospf6_zebra_route_update(int type, struct ospf6_route *request)
 {
-       struct zapi_ipv6 api;
+       struct zapi_route api;
        char buf[PREFIX2STR_BUFFER];
        int nhcount;
-       struct in6_addr **nexthops;
-       ifindex_t *ifindexes;
        int ret = 0;
-       struct prefix_ipv6 *dest;
+       struct prefix *dest;
 
        if (IS_OSPF6_DEBUG_ZEBRA(SEND)) {
                prefix2str(&request->prefix, buf, sizeof(buf));
@@ -387,36 +385,16 @@ static void ospf6_zebra_route_update(int type, struct ospf6_route *request)
                return;
        }
 
-       /* allocate memory for nexthop_list */
-       nexthops =
-               XCALLOC(MTYPE_OSPF6_OTHER, nhcount * sizeof(struct in6_addr *));
-       if (nexthops == NULL) {
-               zlog_warn("Can't send route to zebra: malloc failed");
-               return;
-       }
-
-       /* allocate memory for ifindex_list */
-       ifindexes = XCALLOC(MTYPE_OSPF6_OTHER, nhcount * sizeof(ifindex_t));
-       if (ifindexes == NULL) {
-               zlog_warn("Can't send route to zebra: malloc failed");
-               XFREE(MTYPE_OSPF6_OTHER, nexthops);
-               return;
-       }
-
-       ospf6_route_zebra_copy_nexthops(request, ifindexes, nexthops, nhcount);
+       dest = &request->prefix;
 
+       memset(&api, 0, sizeof(api));
        api.vrf_id = VRF_DEFAULT;
        api.type = ZEBRA_ROUTE_OSPF6;
-       api.instance = 0;
-       api.flags = 0;
-       api.message = 0;
        api.safi = SAFI_UNICAST;
+       api.prefix = *dest;
        SET_FLAG(api.message, ZAPI_MESSAGE_NEXTHOP);
        api.nexthop_num = nhcount;
-       api.nexthop = nexthops;
-       SET_FLAG(api.message, ZAPI_MESSAGE_IFINDEX);
-       api.ifindex_num = nhcount;
-       api.ifindex = ifindexes;
+       ospf6_route_zebra_copy_nexthops(request, api.nexthops, nhcount);
        SET_FLAG(api.message, ZAPI_MESSAGE_METRIC);
        api.metric = (request->path.metric_type == 2 ? request->path.u.cost_e2
                                                     : request->path.cost);
@@ -425,26 +403,20 @@ static void ospf6_zebra_route_update(int type, struct ospf6_route *request)
                api.tag = request->path.tag;
        }
 
-       dest = (struct prefix_ipv6 *)&request->prefix;
-
        SET_FLAG(api.message, ZAPI_MESSAGE_DISTANCE);
-       api.distance = ospf6_distance_apply(dest, request);
+       api.distance =
+               ospf6_distance_apply((struct prefix_ipv6 *)dest, request);
 
        if (type == REM)
-               ret = zapi_ipv6_route(ZEBRA_IPV6_ROUTE_DELETE, zclient, dest,
-                                     NULL, &api);
+               ret = zclient_route_send(ZEBRA_ROUTE_DELETE, zclient, &api);
        else
-               ret = zapi_ipv6_route(ZEBRA_IPV6_ROUTE_ADD, zclient, dest, NULL,
-                                     &api);
+               ret = zclient_route_send(ZEBRA_ROUTE_ADD, zclient, &api);
 
        if (ret < 0)
-               zlog_err("zapi_ipv6_route() %s failed: %s",
+               zlog_err("zclient_route_send() %s failed: %s",
                         (type == REM ? "delete" : "add"),
                         safe_strerror(errno));
 
-       XFREE(MTYPE_OSPF6_OTHER, nexthops);
-       XFREE(MTYPE_OSPF6_OTHER, ifindexes);
-
        return;
 }
 
@@ -460,40 +432,32 @@ void ospf6_zebra_route_update_remove(struct ospf6_route *request)
 
 void ospf6_zebra_add_discard(struct ospf6_route *request)
 {
-       struct zapi_ipv6 api;
+       struct zapi_route api;
        char buf[INET6_ADDRSTRLEN];
-       struct prefix_ipv6 *dest;
+       struct prefix *dest = &request->prefix;
 
        if (!CHECK_FLAG(request->flag, OSPF6_ROUTE_BLACKHOLE_ADDED)) {
+               memset(&api, 0, sizeof(api));
                api.vrf_id = VRF_DEFAULT;
                api.type = ZEBRA_ROUTE_OSPF6;
                api.flags = ZEBRA_FLAG_BLACKHOLE;
-               api.instance = 0;
-               api.message = 0;
                api.safi = SAFI_UNICAST;
-               SET_FLAG(api.message, ZAPI_MESSAGE_NEXTHOP);
-               api.nexthop_num = 0;
-               api.ifindex_num = 0;
-
-               dest = (struct prefix_ipv6 *)&request->prefix;
+               api.prefix = *dest;
 
-               zapi_ipv6_route(ZEBRA_IPV6_ROUTE_ADD, zclient, dest, NULL,
-                               &api);
+               zclient_route_send(ZEBRA_ROUTE_ADD, zclient, &api);
 
                if (IS_OSPF6_DEBUG_ZEBRA(SEND))
                        zlog_debug("Zebra: Route add discard %s/%d",
-                                  inet_ntop(AF_INET6, &dest->prefix, buf,
+                                  inet_ntop(AF_INET6, &dest->u.prefix6, buf,
                                             INET6_ADDRSTRLEN),
                                   dest->prefixlen);
 
                SET_FLAG(request->flag, OSPF6_ROUTE_BLACKHOLE_ADDED);
        } else {
-               dest = (struct prefix_ipv6 *)&request->prefix;
-
                if (IS_OSPF6_DEBUG_ZEBRA(SEND))
                        zlog_debug(
                                "Zebra: Blackhole route present already %s/%d",
-                               inet_ntop(AF_INET6, &dest->prefix, buf,
+                               inet_ntop(AF_INET6, &dest->u.prefix6, buf,
                                          INET6_ADDRSTRLEN),
                                dest->prefixlen);
        }
@@ -501,39 +465,32 @@ void ospf6_zebra_add_discard(struct ospf6_route *request)
 
 void ospf6_zebra_delete_discard(struct ospf6_route *request)
 {
-       struct zapi_ipv6 api;
+       struct zapi_route api;
        char buf[INET6_ADDRSTRLEN];
-       struct prefix_ipv6 *dest;
+       struct prefix *dest = &request->prefix;
 
        if (CHECK_FLAG(request->flag, OSPF6_ROUTE_BLACKHOLE_ADDED)) {
+               memset(&api, 0, sizeof(api));
                api.vrf_id = VRF_DEFAULT;
                api.type = ZEBRA_ROUTE_OSPF6;
                api.flags = ZEBRA_FLAG_BLACKHOLE;
-               api.instance = 0;
-               api.message = 0;
                api.safi = SAFI_UNICAST;
-               SET_FLAG(api.message, ZAPI_MESSAGE_NEXTHOP);
-               api.nexthop_num = 0;
-               api.ifindex_num = 0;
-
-               dest = (struct prefix_ipv6 *)&request->prefix;
+               api.prefix = *dest;
 
-               zapi_ipv6_route(ZEBRA_IPV6_ROUTE_DELETE, zclient, dest, NULL,
-                               &api);
+               zclient_route_send(ZEBRA_ROUTE_DELETE, zclient, &api);
 
                if (IS_OSPF6_DEBUG_ZEBRA(SEND))
                        zlog_debug("Zebra: Route delete discard %s/%d",
-                                  inet_ntop(AF_INET6, &dest->prefix, buf,
+                                  inet_ntop(AF_INET6, &dest->u.prefix6, buf,
                                             INET6_ADDRSTRLEN),
                                   dest->prefixlen);
 
                UNSET_FLAG(request->flag, OSPF6_ROUTE_BLACKHOLE_ADDED);
        } else {
-               dest = (struct prefix_ipv6 *)&request->prefix;
                if (IS_OSPF6_DEBUG_ZEBRA(SEND))
                        zlog_debug(
                                "Zebra: Blackhole route already deleted %s/%d",
-                               inet_ntop(AF_INET6, &dest->prefix, buf,
+                               inet_ntop(AF_INET6, &dest->u.prefix6, buf,
                                          INET6_ADDRSTRLEN),
                                dest->prefixlen);
        }