From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 5 Sep 2018 21:04:35 +0000 (-0400)
Subject: zebra: Fix RB-Tree storage comparison function for v6
X-Git-Tag: frr-7.1-dev~388^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F2981%2Fhead;p=mirror%2Ffrr.git

zebra: Fix RB-Tree storage comparison function for v6

The RB-Tree used to store rmac information was not properly
handling the v6 address family.  Modify the code to allow
this handling.

Cleans up this error message:

zebra[2231]: host_rb_entry_compare: Unexpected family type: 10

That is being seen, This fixes some connectivity issues being seen.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c
index 28adc37b43..5dcbe97166 100644
--- a/zebra/zebra_vxlan.c
+++ b/zebra/zebra_vxlan.c
@@ -207,6 +207,9 @@ static int host_rb_entry_compare(const struct host_rb_entry *hle1,
 			return 1;
 
 		return 0;
+	} else if (hle1->p.family == AF_INET6) {
+		return memcmp(&hle1->p.u.prefix6, &hle2->p.u.prefix6,
+			      IPV6_MAX_BYTELEN);
 	} else {
 		zlog_warn("%s: Unexpected family type: %d", __PRETTY_FUNCTION__,
 			  hle1->p.family);