Merge pull request #3422 from pguibert6WIND/license_gplv3_rule

[mirror_frr.git] / ripngd / ripng_routemap.c

diff --git a/ripngd/ripng_routemap.c b/ripngd/ripng_routemap.c
index e518585c743ec6ec84734a12bb028894f7c49570..9a9e346a5931c33f0684e0f756f1778cd763da83 100644 (file)
--- a/ripngd/ripng_routemap.c
+++ b/ripngd/ripng_routemap.c
@@ -33,16 +33,17 @@
 struct rip_metric_modifier {
        enum { metric_increment, metric_decrement, metric_absolute } type;
        bool used;
-       u_int8_t metric;
+       uint8_t metric;
 };
 
 /* `match metric METRIC' */
 /* Match function return 1 if match is success else return zero. */
-static route_map_result_t route_match_metric(void *rule, struct prefix *prefix,
+static route_map_result_t route_match_metric(void *rule,
+                                            const struct prefix *prefix,
                                             route_map_object_t type,
                                             void *object)
 {
-       u_int32_t *metric;
+       uint32_t *metric;
        struct ripng_info *rinfo;
 
        if (type == RMAP_RIPNG) {
@@ -60,9 +61,9 @@ static route_map_result_t route_match_metric(void *rule, struct prefix *prefix,
 /* Route map `match metric' match statement. `arg' is METRIC value */
 static void *route_match_metric_compile(const char *arg)
 {
-       u_int32_t *metric;
+       uint32_t *metric;
 
-       metric = XMALLOC(MTYPE_ROUTE_MAP_COMPILED, sizeof(u_int32_t));
+       metric = XMALLOC(MTYPE_ROUTE_MAP_COMPILED, sizeof(uint32_t));
        *metric = atoi(arg);
 
        if (*metric > 0)
@@ -86,7 +87,7 @@ static struct route_map_rule_cmd route_match_metric_cmd = {
 /* `match interface IFNAME' */
 /* Match function return 1 if match is success else return zero. */
 static route_map_result_t route_match_interface(void *rule,
-                                               struct prefix *prefix,
+                                               const struct prefix *prefix,
                                                route_map_object_t type,
                                                void *object)
 {
@@ -128,7 +129,8 @@ static struct route_map_rule_cmd route_match_interface_cmd = {
 
 /* `match tag TAG' */
 /* Match function return 1 if match is success else return zero. */
-static route_map_result_t route_match_tag(void *rule, struct prefix *prefix,
+static route_map_result_t route_match_tag(void *rule,
+                                         const struct prefix *prefix,
                                          route_map_object_t type, void *object)
 {
        route_tag_t *tag;
@@ -157,7 +159,8 @@ static struct route_map_rule_cmd route_match_tag_cmd = {
 /* `set metric METRIC' */
 
 /* Set metric to attribute. */
-static route_map_result_t route_set_metric(void *rule, struct prefix *prefix,
+static route_map_result_t route_set_metric(void *rule,
+                                          const struct prefix *prefix,
                                           route_map_object_t type,
                                           void *object)
 {
@@ -254,7 +257,7 @@ static struct route_map_rule_cmd route_set_metric_cmd = {
 
 /* Set nexthop to object.  ojbect must be pointer to struct attr. */
 static route_map_result_t route_set_ipv6_nexthop_local(void *rule,
-                                                      struct prefix *prefix,
+                                                      const struct prefix *p,
                                                       route_map_object_t type,
                                                       void *object)
 {
@@ -307,7 +310,8 @@ static struct route_map_rule_cmd route_set_ipv6_nexthop_local_cmd = {
 /* `set tag TAG' */
 
 /* Set tag to object.  ojbect must be pointer to struct attr. */
-static route_map_result_t route_set_tag(void *rule, struct prefix *prefix,
+static route_map_result_t route_set_tag(void *rule,
+                                       const struct prefix *prefix,
                                        route_map_object_t type, void *object)
 {
        route_tag_t *tag;
@@ -333,12 +337,6 @@ static struct route_map_rule_cmd route_set_tag_cmd = {
 #define MATCH_STR "Match values from routing table\n"
 #define SET_STR "Set values in destination routing protocol\n"
 
-void ripng_route_map_reset()
-{
-       /* XXX ??? */
-       ;
-}
-
 void ripng_route_map_init()
 {
        route_map_init();