summaryrefslogtreecommitdiffstats
path: root/ripngd
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@diac24.net>2019-11-20 17:20:58 +0100
committerDavid Lamparter <equinox@diac24.net>2019-11-30 00:38:32 +0100
commit364deb0487600073aca8396ed80e35da589f3eca (patch)
treeeac52048c0bea7a698bc16f2410668c2c72cc438 /ripngd
parentlib: make cmd_element & qobj_type const (diff)
downloadfrr-364deb0487600073aca8396ed80e35da589f3eca.tar.xz
frr-364deb0487600073aca8396ed80e35da589f3eca.zip
*: make all route_map_rule_cmd const
Signed-off-by: David Lamparter <equinox@diac24.net>
Diffstat (limited to 'ripngd')
-rw-r--r--ripngd/ripng_routemap.c48
1 files changed, 32 insertions, 16 deletions
diff --git a/ripngd/ripng_routemap.c b/ripngd/ripng_routemap.c
index d27ec76a5..612359142 100644
--- a/ripngd/ripng_routemap.c
+++ b/ripngd/ripng_routemap.c
@@ -79,9 +79,12 @@ static void route_match_metric_free(void *rule)
}
/* Route map commands for metric matching. */
-static struct route_map_rule_cmd route_match_metric_cmd = {
- "metric", route_match_metric, route_match_metric_compile,
- route_match_metric_free};
+static const struct route_map_rule_cmd route_match_metric_cmd = {
+ "metric",
+ route_match_metric,
+ route_match_metric_compile,
+ route_match_metric_free
+};
/* `match interface IFNAME' */
/* Match function return 1 if match is success else return zero. */
@@ -121,9 +124,12 @@ static void route_match_interface_free(void *rule)
XFREE(MTYPE_ROUTE_MAP_COMPILED, rule);
}
-static struct route_map_rule_cmd route_match_interface_cmd = {
- "interface", route_match_interface, route_match_interface_compile,
- route_match_interface_free};
+static const struct route_map_rule_cmd route_match_interface_cmd = {
+ "interface",
+ route_match_interface,
+ route_match_interface_compile,
+ route_match_interface_free
+};
/* `match tag TAG' */
/* Match function return 1 if match is success else return zero. */
@@ -150,8 +156,10 @@ static enum route_map_cmd_result_t route_match_tag(void *rule,
return RMAP_NOMATCH;
}
-static struct route_map_rule_cmd route_match_tag_cmd = {
- "tag", route_match_tag, route_map_rule_tag_compile,
+static const struct route_map_rule_cmd route_match_tag_cmd = {
+ "tag",
+ route_match_tag,
+ route_map_rule_tag_compile,
route_map_rule_tag_free,
};
@@ -246,8 +254,10 @@ static void route_set_metric_free(void *rule)
XFREE(MTYPE_ROUTE_MAP_COMPILED, rule);
}
-static struct route_map_rule_cmd route_set_metric_cmd = {
- "metric", route_set_metric, route_set_metric_compile,
+static const struct route_map_rule_cmd route_set_metric_cmd = {
+ "metric",
+ route_set_metric,
+ route_set_metric_compile,
route_set_metric_free,
};
@@ -299,10 +309,13 @@ static void route_set_ipv6_nexthop_local_free(void *rule)
}
/* Route map commands for ipv6 nexthop local set. */
-static struct route_map_rule_cmd route_set_ipv6_nexthop_local_cmd = {
- "ipv6 next-hop local", route_set_ipv6_nexthop_local,
+static const struct route_map_rule_cmd
+ route_set_ipv6_nexthop_local_cmd = {
+ "ipv6 next-hop local",
+ route_set_ipv6_nexthop_local,
route_set_ipv6_nexthop_local_compile,
- route_set_ipv6_nexthop_local_free};
+ route_set_ipv6_nexthop_local_free
+};
/* `set tag TAG' */
@@ -327,9 +340,12 @@ route_set_tag(void *rule, const struct prefix *prefix, route_map_object_t type,
}
/* Route map commands for tag set. */
-static struct route_map_rule_cmd route_set_tag_cmd = {
- "tag", route_set_tag, route_map_rule_tag_compile,
- route_map_rule_tag_free};
+static const struct route_map_rule_cmd route_set_tag_cmd = {
+ "tag",
+ route_set_tag,
+ route_map_rule_tag_compile,
+ route_map_rule_tag_free
+};
#define MATCH_STR "Match values from routing table\n"
#define SET_STR "Set values in destination routing protocol\n"