Merge pull request #5288 from SumitAgarwal123/bfd_docs

[mirror_frr.git] / ospf6d / ospf6_asbr.c

diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c
index 946bbf8cc9423f8fb9a5309f2c79203b4f3f6a16..facb6aa63f4bf6fe8e106b7558881c804d2c7b4d 100644 (file)
--- a/ospf6d/ospf6_asbr.c
+++ b/ospf6d/ospf6_asbr.c
@@ -1018,7 +1018,7 @@ void ospf6_asbr_redistribute_add(int type, ifindex_t ifindex,
                                 unsigned int nexthop_num,
                                 struct in6_addr *nexthop, route_tag_t tag)
 {
-       int ret;
+       route_map_result_t ret;
        struct ospf6_route troute;
        struct ospf6_external_info tinfo;
        struct ospf6_route *route, *match;
@@ -1355,7 +1355,7 @@ static void ospf6_redistribute_show_config(struct vty *vty)
 
 
 /* Routemap Functions */
-static route_map_result_t
+static enum route_map_cmd_result_t
 ospf6_routemap_rule_match_address_prefixlist(void *rule,
                                             const struct prefix *prefix,
                                             route_map_object_t type,
@@ -1385,7 +1385,8 @@ static void ospf6_routemap_rule_match_address_prefixlist_free(void *rule)
        XFREE(MTYPE_ROUTE_MAP_COMPILED, rule);
 }
 
-struct route_map_rule_cmd ospf6_routemap_rule_match_address_prefixlist_cmd = {
+static const struct route_map_rule_cmd
+               ospf6_routemap_rule_match_address_prefixlist_cmd = {
        "ipv6 address prefix-list",
        ospf6_routemap_rule_match_address_prefixlist,
        ospf6_routemap_rule_match_address_prefixlist_compile,
@@ -1395,7 +1396,7 @@ struct route_map_rule_cmd ospf6_routemap_rule_match_address_prefixlist_cmd = {
 /* `match interface IFNAME' */
 /* Match function should return 1 if match is success else return
    zero. */
-static route_map_result_t
+static enum route_map_cmd_result_t
 ospf6_routemap_rule_match_interface(void *rule, const struct prefix *prefix,
                                    route_map_object_t type, void *object)
 {
@@ -1427,16 +1428,18 @@ static void ospf6_routemap_rule_match_interface_free(void *rule)
 }
 
 /* Route map commands for interface matching. */
-struct route_map_rule_cmd ospf6_routemap_rule_match_interface_cmd = {
-       "interface", ospf6_routemap_rule_match_interface,
+static const struct route_map_rule_cmd
+               ospf6_routemap_rule_match_interface_cmd = {
+       "interface",
+       ospf6_routemap_rule_match_interface,
        ospf6_routemap_rule_match_interface_compile,
-       ospf6_routemap_rule_match_interface_free};
+       ospf6_routemap_rule_match_interface_free
+};
 
 /* Match function for matching route tags */
-static route_map_result_t ospf6_routemap_rule_match_tag(void *rule,
-                                                       const struct prefix *p,
-                                                       route_map_object_t type,
-                                                       void *object)
+static enum route_map_cmd_result_t
+ospf6_routemap_rule_match_tag(void *rule, const struct prefix *p,
+                             route_map_object_t type, void *object)
 {
        route_tag_t *tag = rule;
        struct ospf6_route *route = object;
@@ -1448,12 +1451,15 @@ static route_map_result_t ospf6_routemap_rule_match_tag(void *rule,
        return RMAP_NOMATCH;
 }
 
-static struct route_map_rule_cmd ospf6_routemap_rule_match_tag_cmd = {
-       "tag", ospf6_routemap_rule_match_tag, route_map_rule_tag_compile,
+static const struct route_map_rule_cmd
+               ospf6_routemap_rule_match_tag_cmd = {
+       "tag",
+       ospf6_routemap_rule_match_tag,
+       route_map_rule_tag_compile,
        route_map_rule_tag_free,
 };
 
-static route_map_result_t
+static enum route_map_cmd_result_t
 ospf6_routemap_rule_set_metric_type(void *rule, const struct prefix *prefix,
                                    route_map_object_t type, void *object)
 {
@@ -1483,13 +1489,15 @@ static void ospf6_routemap_rule_set_metric_type_free(void *rule)
        XFREE(MTYPE_ROUTE_MAP_COMPILED, rule);
 }
 
-struct route_map_rule_cmd ospf6_routemap_rule_set_metric_type_cmd = {
-       "metric-type", ospf6_routemap_rule_set_metric_type,
+static const struct route_map_rule_cmd
+               ospf6_routemap_rule_set_metric_type_cmd = {
+       "metric-type",
+       ospf6_routemap_rule_set_metric_type,
        ospf6_routemap_rule_set_metric_type_compile,
        ospf6_routemap_rule_set_metric_type_free,
 };
 
-static route_map_result_t
+static enum route_map_cmd_result_t
 ospf6_routemap_rule_set_metric(void *rule, const struct prefix *prefix,
                               route_map_object_t type, void *object)
 {
@@ -1518,13 +1526,15 @@ static void ospf6_routemap_rule_set_metric_free(void *rule)
        XFREE(MTYPE_ROUTE_MAP_COMPILED, rule);
 }
 
-struct route_map_rule_cmd ospf6_routemap_rule_set_metric_cmd = {
-       "metric", ospf6_routemap_rule_set_metric,
+static const struct route_map_rule_cmd
+               ospf6_routemap_rule_set_metric_cmd = {
+       "metric",
+       ospf6_routemap_rule_set_metric,
        ospf6_routemap_rule_set_metric_compile,
        ospf6_routemap_rule_set_metric_free,
 };
 
-static route_map_result_t
+static enum route_map_cmd_result_t
 ospf6_routemap_rule_set_forwarding(void *rule, const struct prefix *prefix,
                                   route_map_object_t type, void *object)
 {
@@ -1556,16 +1566,17 @@ static void ospf6_routemap_rule_set_forwarding_free(void *rule)
        XFREE(MTYPE_ROUTE_MAP_COMPILED, rule);
 }
 
-struct route_map_rule_cmd ospf6_routemap_rule_set_forwarding_cmd = {
-       "forwarding-address", ospf6_routemap_rule_set_forwarding,
+static const struct route_map_rule_cmd
+               ospf6_routemap_rule_set_forwarding_cmd = {
+       "forwarding-address",
+       ospf6_routemap_rule_set_forwarding,
        ospf6_routemap_rule_set_forwarding_compile,
        ospf6_routemap_rule_set_forwarding_free,
 };
 
-static route_map_result_t ospf6_routemap_rule_set_tag(void *rule,
-                                                     const struct prefix *p,
-                                                     route_map_object_t type,
-                                                     void *object)
+static enum route_map_cmd_result_t
+ospf6_routemap_rule_set_tag(void *rule, const struct prefix *p,
+                           route_map_object_t type, void *object)
 {
        route_tag_t *tag = rule;
        struct ospf6_route *route = object;
@@ -1578,12 +1589,15 @@ static route_map_result_t ospf6_routemap_rule_set_tag(void *rule,
        return RMAP_OKAY;
 }
 
-static struct route_map_rule_cmd ospf6_routemap_rule_set_tag_cmd = {
-       "tag", ospf6_routemap_rule_set_tag, route_map_rule_tag_compile,
+static const struct route_map_rule_cmd
+               ospf6_routemap_rule_set_tag_cmd = {
+       "tag",
+       ospf6_routemap_rule_set_tag,
+       route_map_rule_tag_compile,
        route_map_rule_tag_free,
 };
 
-static int route_map_command_status(struct vty *vty, int ret)
+static int route_map_command_status(struct vty *vty, enum rmap_compile_rets ret)
 {
        switch (ret) {
        case RMAP_RULE_MISSING:
@@ -1612,8 +1626,10 @@ DEFUN (ospf6_routemap_set_metric_type,
 {
        VTY_DECLVAR_CONTEXT(route_map_index, route_map_index);
        int idx_external = 2;
-       int ret = route_map_add_set(route_map_index, "metric-type",
-                                   argv[idx_external]->arg);
+       enum rmap_compile_rets ret = route_map_add_set(route_map_index,
+                                                      "metric-type",
+                                                      argv[idx_external]->arg);
+
        return route_map_command_status(vty, ret);
 }
 
@@ -1629,7 +1645,9 @@ DEFUN (ospf6_routemap_no_set_metric_type,
 {
        VTY_DECLVAR_CONTEXT(route_map_index, route_map_index);
        char *ext = (argc == 4) ? argv[3]->text : NULL;
-       int ret = route_map_delete_set(route_map_index, "metric-type", ext);
+       enum rmap_compile_rets ret = route_map_delete_set(route_map_index,
+                                                         "metric-type", ext);
+
        return route_map_command_status(vty, ret);
 }
 
@@ -1643,8 +1661,10 @@ DEFUN (ospf6_routemap_set_forwarding,
 {
        VTY_DECLVAR_CONTEXT(route_map_index, route_map_index);
        int idx_ipv6 = 2;
-       int ret = route_map_add_set(route_map_index, "forwarding-address",
-                                   argv[idx_ipv6]->arg);
+       enum rmap_compile_rets ret = route_map_add_set(route_map_index,
+                                                      "forwarding-address",
+                                                      argv[idx_ipv6]->arg);
+
        return route_map_command_status(vty, ret);
 }
 
@@ -1659,8 +1679,10 @@ DEFUN (ospf6_routemap_no_set_forwarding,
 {
        VTY_DECLVAR_CONTEXT(route_map_index, route_map_index);
        int idx_ipv6 = 3;
-       int ret = route_map_delete_set(route_map_index, "forwarding-address",
-                                      argv[idx_ipv6]->arg);
+       enum rmap_compile_rets ret = route_map_delete_set(route_map_index,
+                                                         "forwarding-address",
+                                                         argv[idx_ipv6]->arg);
+
        return route_map_command_status(vty, ret);
 }
 
@@ -1836,7 +1858,7 @@ DEFUN (show_ipv6_ospf6_redistribute,
        return CMD_SUCCESS;
 }
 
-struct ospf6_lsa_handler as_external_handler = {
+static const struct ospf6_lsa_handler as_external_handler = {
        .lh_type = OSPF6_LSTYPE_AS_EXTERNAL,
        .lh_name = "AS-External",
        .lh_short_name = "ASE",