Merge pull request #5639 from qlyoung/fix-zebra-ptm-double-free

[mirror_frr.git] / isisd / isis_route.h

diff --git a/isisd/isis_route.h b/isisd/isis_route.h
index 9d6858586be5d696be2cc4f045fbbfc0b17a52d9..2326bb8228c05569573c615de7d460a73cdf9d90 100644 (file)
--- a/isisd/isis_route.h
+++ b/isisd/isis_route.h
@@ -25,17 +25,12 @@
 #ifndef _ZEBRA_ISIS_ROUTE_H
 #define _ZEBRA_ISIS_ROUTE_H
 
-struct isis_nexthop6 {
-       ifindex_t ifindex;
-       struct in6_addr ip6;
-       struct in6_addr router_address6;
-       unsigned int lock;
-};
+#include "lib/nexthop.h"
 
 struct isis_nexthop {
        ifindex_t ifindex;
-       struct in_addr ip;
-       struct in_addr router_address;
+       int family;
+       union g_addr ip;
        unsigned int lock;
 };
 
@@ -47,9 +42,13 @@ struct isis_route_info {
        uint32_t cost;
        uint32_t depth;
        struct list *nexthops;
-       struct list *nexthops6;
 };
 
+DECLARE_HOOK(isis_route_update_hook,
+            (struct isis_area * area, struct prefix *prefix,
+             struct isis_route_info *route_info),
+            (area, prefix, route_info))
+
 struct isis_route_info *isis_route_create(struct prefix *prefix,
                                          struct prefix_ipv6 *src_p,
                                          uint32_t cost,