]> git.puffer.fish Git - mirror/frr.git/commitdiff
isisd: type mix-up in 28a8cfc "don't require IPv4"
authorDavid Lamparter <equinox@opensourcerouting.org>
Mon, 18 Aug 2014 16:05:25 +0000 (18:05 +0200)
committerDavid Lamparter <equinox@opensourcerouting.org>
Mon, 18 Aug 2014 16:16:28 +0000 (18:16 +0200)
Whoops, these are in6_addrs, not prefix_ipv6... funnily enough, it does the
right thing either way, if it compiles, which it only does on Linux because
IN6_IS_ADDR_LINKLOCAL contains a cast to the right type.  On BSD there is no
such cast, hence it explodes on trying to compile, trying to access struct
members of in6_addrs while operating on prefix_ipv6...

Fixes: 28a8cfc ("isisd: don't require IPv4 for adjacency")
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
isisd/isis_pdu.c

index 5f18135e871f28c922740e0db5cfd30136fcea42..e0208fa47fbd068b842601c2646a826fd1711dc9 100644 (file)
@@ -537,7 +537,7 @@ process_p2p_hello (struct isis_circuit *circuit)
     {
       /* TBA: check that we have a linklocal ourselves? */
       struct listnode *node;
-      struct prefix_ipv6 *ip;
+      struct in6_addr *ip;
       for (ALL_LIST_ELEMENTS_RO (tlvs.ipv6_addrs, node, ip))
        if (IN6_IS_ADDR_LINKLOCAL (ip))
          {
@@ -1098,7 +1098,7 @@ process_lan_hello (int level, struct isis_circuit *circuit, u_char * ssnpa)
     {
       /* TBA: check that we have a linklocal ourselves? */
       struct listnode *node;
-      struct prefix_ipv6 *ip;
+      struct in6_addr *ip;
       for (ALL_LIST_ELEMENTS_RO (tlvs.ipv6_addrs, node, ip))
        if (IN6_IS_ADDR_LINKLOCAL (ip))
          {