proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-16 12:16:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #630 from opensourcerouting/zebra-lbl-unicast-issues

Browse Source 
Zebra labeled unicast issues
This commit is contained in:
Donald Sharp 2017-05-30 09:13:04 -04:00 committed by GitHub
commit c0619fdb86
2 changed files with 47 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
zebra/rt_netlink.c
View File

@ -689,28 +689,6 @@ _netlink_route_build_singlepath(
mpls_lse_t out_lse[MPLS_MAX_LABELS]; mpls_lse_t out_lse[MPLS_MAX_LABELS];
char label_buf[100]; char label_buf[100];
if (rtmsg->rtm_family == AF_INET &&
(nexthop->type == NEXTHOP_TYPE_IPV6
|| nexthop->type == NEXTHOP_TYPE_IPV6_IFINDEX))
{
rtmsg->rtm_flags |= RTNH_F_ONLINK;
addattr_l (nlmsg, req_size, RTA_GATEWAY, &ipv4_ll, 4);
addattr32 (nlmsg, req_size, RTA_OIF, nexthop->ifindex);
if (nexthop->rmap_src.ipv4.s_addr && (cmd == RTM_NEWROUTE))
addattr_l (nlmsg, req_size, RTA_PREFSRC,
&nexthop->rmap_src.ipv4, bytelen);
else if (nexthop->src.ipv4.s_addr && (cmd == RTM_NEWROUTE))
addattr_l (nlmsg, req_size, RTA_PREFSRC,
&nexthop->src.ipv4, bytelen);
if (IS_ZEBRA_DEBUG_KERNEL)
zlog_debug(" 5549: _netlink_route_build_singlepath() (%s): "
"nexthop via %s if %u",
routedesc, ipv4_ll_buf, nexthop->ifindex);
return;
}
/* /*
* label_buf is *only* currently used within debugging. * label_buf is *only* currently used within debugging.
* As such when we assign it we are guarding it inside * As such when we assign it we are guarding it inside
@ -776,6 +754,28 @@ _netlink_route_build_singlepath(
if (CHECK_FLAG (nexthop->flags, NEXTHOP_FLAG_ONLINK)) if (CHECK_FLAG (nexthop->flags, NEXTHOP_FLAG_ONLINK))
rtmsg->rtm_flags |= RTNH_F_ONLINK; rtmsg->rtm_flags |= RTNH_F_ONLINK;
if (rtmsg->rtm_family == AF_INET &&
(nexthop->type == NEXTHOP_TYPE_IPV6
|| nexthop->type == NEXTHOP_TYPE_IPV6_IFINDEX))
{
rtmsg->rtm_flags |= RTNH_F_ONLINK;
addattr_l (nlmsg, req_size, RTA_GATEWAY, &ipv4_ll, 4);
addattr32 (nlmsg, req_size, RTA_OIF, nexthop->ifindex);
if (nexthop->rmap_src.ipv4.s_addr && (cmd == RTM_NEWROUTE))
addattr_l (nlmsg, req_size, RTA_PREFSRC,
&nexthop->rmap_src.ipv4, bytelen);
else if (nexthop->src.ipv4.s_addr && (cmd == RTM_NEWROUTE))
addattr_l (nlmsg, req_size, RTA_PREFSRC,
&nexthop->src.ipv4, bytelen);
if (IS_ZEBRA_DEBUG_KERNEL)
zlog_debug(" 5549: _netlink_route_build_singlepath() (%s): "
"nexthop via %s %s if %u",
routedesc, ipv4_ll_buf, label_buf, nexthop->ifindex);
return;
}
if (nexthop->type == NEXTHOP_TYPE_IPV4 if (nexthop->type == NEXTHOP_TYPE_IPV4
|| nexthop->type == NEXTHOP_TYPE_IPV4_IFINDEX) || nexthop->type == NEXTHOP_TYPE_IPV4_IFINDEX)
{ {
@ -801,6 +801,7 @@ _netlink_route_build_singlepath(
inet_ntoa (nexthop->gate.ipv4), inet_ntoa (nexthop->gate.ipv4),
label_buf, nexthop->ifindex); label_buf, nexthop->ifindex);
} }
if (nexthop->type == NEXTHOP_TYPE_IPV6 if (nexthop->type == NEXTHOP_TYPE_IPV6
|| nexthop->type == NEXTHOP_TYPE_IPV6_IFINDEX) || nexthop->type == NEXTHOP_TYPE_IPV6_IFINDEX)
{ {
@ -899,29 +900,6 @@ _netlink_route_build_multipath(
rtnh->rtnh_hops = 0; rtnh->rtnh_hops = 0;
rta->rta_len += rtnh->rtnh_len; rta->rta_len += rtnh->rtnh_len;
if (rtmsg->rtm_family == AF_INET &&
(nexthop->type == NEXTHOP_TYPE_IPV6
|| nexthop->type == NEXTHOP_TYPE_IPV6_IFINDEX))
{
bytelen = 4;
rtnh->rtnh_flags |= RTNH_F_ONLINK;
rta_addattr_l (rta, NL_PKT_BUF_SIZE, RTA_GATEWAY,
&ipv4_ll, bytelen);
rtnh->rtnh_len += sizeof (struct rtattr) + bytelen;
rtnh->rtnh_ifindex = nexthop->ifindex;
if (nexthop->rmap_src.ipv4.s_addr)
*src = &nexthop->rmap_src;
else if (nexthop->src.ipv4.s_addr)
*src = &nexthop->src;
if (IS_ZEBRA_DEBUG_KERNEL)
zlog_debug(" 5549: netlink_route_build_multipath() (%s): "
"nexthop via %s if %u",
routedesc, ipv4_ll_buf, nexthop->ifindex);
return;
}
/* /*
* label_buf is *only* currently used within debugging. * label_buf is *only* currently used within debugging.
* As such when we assign it we are guarding it inside * As such when we assign it we are guarding it inside
@ -992,6 +970,29 @@ _netlink_route_build_multipath(
if (CHECK_FLAG (nexthop->flags, NEXTHOP_FLAG_ONLINK)) if (CHECK_FLAG (nexthop->flags, NEXTHOP_FLAG_ONLINK))
rtnh->rtnh_flags |= RTNH_F_ONLINK; rtnh->rtnh_flags |= RTNH_F_ONLINK;
if (rtmsg->rtm_family == AF_INET &&
(nexthop->type == NEXTHOP_TYPE_IPV6
|| nexthop->type == NEXTHOP_TYPE_IPV6_IFINDEX))
{
bytelen = 4;
rtnh->rtnh_flags |= RTNH_F_ONLINK;
rta_addattr_l (rta, NL_PKT_BUF_SIZE, RTA_GATEWAY,
&ipv4_ll, bytelen);
rtnh->rtnh_len += sizeof (struct rtattr) + bytelen;
rtnh->rtnh_ifindex = nexthop->ifindex;
if (nexthop->rmap_src.ipv4.s_addr)
*src = &nexthop->rmap_src;
else if (nexthop->src.ipv4.s_addr)
*src = &nexthop->src;
if (IS_ZEBRA_DEBUG_KERNEL)
zlog_debug(" 5549: netlink_route_build_multipath() (%s): "
"nexthop via %s %s if %u",
routedesc, ipv4_ll_buf, label_buf, nexthop->ifindex);
return;
}
if (nexthop->type == NEXTHOP_TYPE_IPV4 if (nexthop->type == NEXTHOP_TYPE_IPV4
|| nexthop->type == NEXTHOP_TYPE_IPV4_IFINDEX) || nexthop->type == NEXTHOP_TYPE_IPV4_IFINDEX)
{ {

2
zebra/zserv.c
View File

@ -1609,7 +1609,7 @@ zread_ipv6_add (struct zserv *client, u_short length, struct zebra_vrf *zvrf)
if (CHECK_FLAG (message, ZAPI_MESSAGE_LABEL)) if (CHECK_FLAG (message, ZAPI_MESSAGE_LABEL))
{ {
label = (mpls_label_t)stream_getl (s); label = (mpls_label_t)stream_getl (s);
labels[nh_count++] = label; labels[nh_count] = label;
} }
nexthops[nh_count++] = nhop_addr; nexthops[nh_count++] = nhop_addr;
} }