0
0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-23 10:11:53 +00:00

Merge commit '8bd9b930c320f09d3b3792b5f991cf702e9d55be' into integrated

This commit is contained in:
Ondrej Zajicek 2013-05-23 00:00:26 +02:00
commit 048146e90c

View File

@ -820,7 +820,7 @@ bgp_set_next_hop(struct bgp_proto *p, rta *a)
ip_addr *nexthop = (ip_addr *) nh->u.ptr->data; ip_addr *nexthop = (ip_addr *) nh->u.ptr->data;
#ifdef IPV6 #ifdef IPV6
int second = (nh->u.ptr->length == NEXT_HOP_LENGTH); int second = (nh->u.ptr->length == NEXT_HOP_LENGTH) && ipa_nonzero(nexthop[1]);
/* First address should not be link-local, but may be zero in direct mode */ /* First address should not be link-local, but may be zero in direct mode */
if (ipa_has_link_scope(*nexthop)) if (ipa_has_link_scope(*nexthop))