From: Christian Franke <chris@opensourcerouting.org>
Date: Tue, 10 Nov 2015 17:33:14 +0000 (+0100)
Subject: isisd: fix IPv6 mask application
X-Git-Tag: frr-2.0-rc1~1009
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=8c8829a620ee6d3f1967fa9f33e9589517f309ed;p=mirror%2Ffrr.git

isisd: fix IPv6 mask application

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Acked-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
index be1be0cacc..291fa20ab6 100644
--- a/isisd/isis_lsp.c
+++ b/isisd/isis_lsp.c
@@ -1278,7 +1278,7 @@ lsp_build (struct isis_lsp *lsp, struct isis_area *area)
   struct te_ipv4_reachability *te_ipreach;
   struct isis_adjacency *nei;
 #ifdef HAVE_IPV6
-  struct prefix_ipv6 *ipv6, *ip6prefix;
+  struct prefix_ipv6 *ipv6, ip6prefix;
   struct ipv6_reachability *ip6reach;
 #endif /* HAVE_IPV6 */
   struct tlvs tlv_data;
@@ -1535,14 +1535,14 @@ lsp_build (struct isis_lsp *lsp, struct isis_area *area)
 
 	      ip6reach->control_info = 0;
 	      ip6reach->prefix_len = ipv6->prefixlen;
-	      memcpy (&ip6prefix, &ipv6, sizeof(ip6prefix));
-	      apply_mask_ipv6 (ip6prefix);
+	      memcpy(&ip6prefix, ipv6, sizeof(ip6prefix));
+	      apply_mask_ipv6(&ip6prefix);
 
-	      inet_ntop(AF_INET6, &ip6prefix->prefix.s6_addr, buf, sizeof(buf));
+	      inet_ntop(AF_INET6, &ip6prefix.prefix.s6_addr, buf, sizeof(buf));
 	      lsp_debug("ISIS (%s): Adding IPv6 reachability for %s/%d",
 	                area->area_tag, buf, ipv6->prefixlen);
 
-	      memcpy (ip6reach->prefix, ip6prefix->prefix.s6_addr,
+	      memcpy (ip6reach->prefix, ip6prefix.prefix.s6_addr,
 		      sizeof (ip6reach->prefix));
 	      listnode_add (tlv_data.ipv6_reachs, ip6reach);
 	    }