summaryrefslogtreecommitdiffstats
path: root/isisd
diff options
context:
space:
mode:
authorChristian Franke <chris@opensourcerouting.org>2015-11-10 18:33:14 +0100
committerDonald Sharp <sharpd@cumulusnetworks.com>2016-03-30 02:26:31 +0200
commit8c8829a620ee6d3f1967fa9f33e9589517f309ed (patch)
tree84cccc019c97358bec6e4d8cac902111463257ec /isisd
parentisisd: show interface's ipv6 addreses (diff)
downloadfrr-8c8829a620ee6d3f1967fa9f33e9589517f309ed.tar.xz
frr-8c8829a620ee6d3f1967fa9f33e9589517f309ed.zip
isisd: fix IPv6 mask application
Signed-off-by: Christian Franke <chris@opensourcerouting.org> Acked-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'isisd')
-rw-r--r--isisd/isis_lsp.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
index be1be0cac..291fa20ab 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);
}