summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/nexthop.c33
-rw-r--r--lib/nexthop.h10
-rw-r--r--zebra/rt_netlink.c6
-rw-r--r--zebra/rt_socket.c4
-rw-r--r--zebra/zebra_rib.c16
5 files changed, 64 insertions, 5 deletions
diff --git a/lib/nexthop.c b/lib/nexthop.c
index 2dba412f45..ea6a310a4a 100644
--- a/lib/nexthop.c
+++ b/lib/nexthop.c
@@ -71,6 +71,39 @@ int nexthop_same_no_recurse(const struct nexthop *next1,
return 1;
}
+int
+nexthop_same_firsthop (struct nexthop *next1, struct nexthop *next2)
+{
+ int type1 = NEXTHOP_FIRSTHOPTYPE(next1->type);
+ int type2 = NEXTHOP_FIRSTHOPTYPE(next2->type);
+
+ if (type1 != type2)
+ return 0;
+ switch (type1)
+ {
+ case NEXTHOP_TYPE_IPV4_IFINDEX:
+ if (! IPV4_ADDR_SAME (&next1->gate.ipv4, &next2->gate.ipv4))
+ return 0;
+ if (next1->ifindex != next2->ifindex)
+ return 0;
+ break;
+ case NEXTHOP_TYPE_IFINDEX:
+ if (next1->ifindex != next2->ifindex)
+ return 0;
+ break;
+ case NEXTHOP_TYPE_IPV6_IFINDEX:
+ if (! IPV6_ADDR_SAME (&next1->gate.ipv6, &next2->gate.ipv6))
+ return 0;
+ if (next1->ifindex != next2->ifindex)
+ return 0;
+ break;
+ default:
+ /* do nothing */
+ break;
+ }
+ return 1;
+}
+
/*
* nexthop_type_to_str
*/
diff --git a/lib/nexthop.h b/lib/nexthop.h
index 781eb93413..20b0cd5227 100644
--- a/lib/nexthop.h
+++ b/lib/nexthop.h
@@ -50,6 +50,11 @@ enum blackhole_type {
BLACKHOLE_ADMINPROHIB,
};
+/* IPV[46] -> IPV[46]_IFINDEX */
+#define NEXTHOP_FIRSTHOPTYPE(type) \
+ ((type) == NEXTHOP_TYPE_IFINDEX || (type) == NEXTHOP_TYPE_BLACKHOLE) \
+ ? (type) : ((type) | 1)
+
/* Nexthop label structure. */
struct nexthop_label {
u_int8_t num_labels;
@@ -74,6 +79,10 @@ struct nexthop {
#define NEXTHOP_FLAG_ONLINK (1 << 3) /* Nexthop should be installed onlink. */
#define NEXTHOP_FLAG_MATCHED (1 << 4) /* Already matched vs a nexthop */
#define NEXTHOP_FLAG_FILTERED (1 << 5) /* rmap filtered, used by static only */
+#define NEXTHOP_FLAG_DUPLICATE (1 << 6) /* nexthop duplicates another active one */
+#define NEXTHOP_IS_ACTIVE(flags) \
+ (CHECK_FLAG(flags, NEXTHOP_FLAG_ACTIVE) \
+ && !CHECK_FLAG(flags, NEXTHOP_FLAG_DUPLICATE))
/* Nexthop address */
union {
@@ -141,6 +150,7 @@ extern const char *nexthop_type_to_str(enum nexthop_types_t nh_type);
extern int nexthop_same_no_recurse(const struct nexthop *next1,
const struct nexthop *next2);
extern int nexthop_labels_match(struct nexthop *nh1, struct nexthop *nh2);
+extern int nexthop_same_firsthop (struct nexthop *next1, struct nexthop *next2);
extern const char *nexthop2str(struct nexthop *nexthop, char *str, int size);
extern struct nexthop *nexthop_next(struct nexthop *nexthop);
diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 12b6185395..e59d5f00fb 100644
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -1383,7 +1383,7 @@ static int netlink_route_multipath(int cmd, struct prefix *p,
if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_RECURSIVE))
continue;
if (cmd == RTM_NEWROUTE
- && !CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE))
+ && !NEXTHOP_IS_ACTIVE(nexthop->flags))
continue;
if (cmd == RTM_DELROUTE
&& !CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB))
@@ -1438,7 +1438,7 @@ static int netlink_route_multipath(int cmd, struct prefix *p,
}
if ((cmd == RTM_NEWROUTE
- && CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE))
+ && NEXTHOP_IS_ACTIVE(nexthop->flags))
|| (cmd == RTM_DELROUTE
&& CHECK_FLAG(nexthop->flags,
NEXTHOP_FLAG_FIB))) {
@@ -1521,7 +1521,7 @@ static int netlink_route_multipath(int cmd, struct prefix *p,
}
if ((cmd == RTM_NEWROUTE
- && CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE))
+ && NEXTHOP_IS_ACTIVE(nexthop->flags))
|| (cmd == RTM_DELROUTE
&& CHECK_FLAG(nexthop->flags,
NEXTHOP_FLAG_FIB))) {
diff --git a/zebra/rt_socket.c b/zebra/rt_socket.c
index d8e37a10c3..75207a2dde 100644
--- a/zebra/rt_socket.c
+++ b/zebra/rt_socket.c
@@ -136,7 +136,7 @@ static int kernel_rtm_ipv4(int cmd, struct prefix *p, struct route_entry *re)
* other than ADD and DELETE?
*/
if ((cmd == RTM_ADD
- && CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE))
+ && NEXTHOP_IS_ACTIVE(nexthop->flags))
|| (cmd == RTM_DELETE
&& CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB))) {
if (nexthop->type == NEXTHOP_TYPE_IPV4
@@ -314,7 +314,7 @@ static int kernel_rtm_ipv6(int cmd, struct prefix *p, struct route_entry *re)
gate = 0;
if ((cmd == RTM_ADD
- && CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE))
+ && NEXTHOP_IS_ACTIVE(nexthop->flags))
|| (cmd == RTM_DELETE
#if 0
&& CHECK_FLAG (nexthop->flags, NEXTHOP_FLAG_FIB)
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index c4c80b156b..f88e594a99 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -1000,8 +1000,24 @@ int rib_install_kernel(struct route_node *rn, struct route_entry *re,
for (ALL_NEXTHOPS(re->nexthop, nexthop))
SET_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB);
return ret;
+ } else {
+ struct nexthop *prev;
+
+ for (ALL_NEXTHOPS(re->nexthop, nexthop)) {
+ UNSET_FLAG (nexthop->flags, NEXTHOP_FLAG_DUPLICATE);
+ for (ALL_NEXTHOPS(re->nexthop, prev)) {
+ if (prev == nexthop)
+ break;
+ if (nexthop_same_firsthop (nexthop, prev))
+ {
+ SET_FLAG (nexthop->flags, NEXTHOP_FLAG_DUPLICATE);
+ break;
+ }
+ }
+ }
}
+
/*
* Make sure we update the FPM any time we send new information to
* the kernel.