]> git.puffer.fish Git - mirror/frr.git/commitdiff
isisd: fix IPv6 mask application
authorChristian Franke <chris@opensourcerouting.org>
Tue, 10 Nov 2015 17:33:14 +0000 (18:33 +0100)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 30 Mar 2016 00:26:31 +0000 (20:26 -0400)
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Acked-by: Donald Sharp <sharpd@cumulusnetworks.com>
isisd/isis_lsp.c

index be1be0caccffcff542d87185215f73cfba6f1674..291fa20ab65e9d83ab25fd23e846430e6ec19afb 100644 (file)
@@ -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);
            }