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

Merge pull request #1638 from LabNConsulting/working/master/vnc2zebra

Browse Source 
bgpd: fix handling of nhp_ary when exporting vrf routes to zebra
This commit is contained in:
Renato Westphal 2018-01-16 10:19:57 -02:00 committed by GitHub
commit 21f8f3438f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bgpd/rfapi/vnc_zebra.c
View File

@ -385,6 +385,8 @@ static void vnc_zebra_route_msg(struct prefix *p, unsigned int nhp_count,
struct zapi_route api; struct zapi_route api;
struct zapi_nexthop *api_nh; struct zapi_nexthop *api_nh;
int i; int i;
struct in_addr **nhp_ary4 = nhp_ary;
struct in6_addr **nhp_ary6 = nhp_ary;
if (!nhp_count) { if (!nhp_count) {
vnc_zlog_debug_verbose("%s: empty nexthop list, skipping", vnc_zlog_debug_verbose("%s: empty nexthop list, skipping",
@ -402,20 +404,16 @@ static void vnc_zebra_route_msg(struct prefix *p, unsigned int nhp_count,
SET_FLAG(api.message, ZAPI_MESSAGE_NEXTHOP); SET_FLAG(api.message, ZAPI_MESSAGE_NEXTHOP);
api.nexthop_num = MIN(nhp_count, multipath_num); api.nexthop_num = MIN(nhp_count, multipath_num);
for (i = 0; i < api.nexthop_num; i++) { for (i = 0; i < api.nexthop_num; i++) {
struct in_addr *nhp_ary4;
struct in6_addr *nhp_ary6;
api_nh = &api.nexthops[i]; api_nh = &api.nexthops[i];
switch (p->family) { switch (p->family) {
case AF_INET: case AF_INET:
nhp_ary4 = nhp_ary; memcpy(&api_nh->gate.ipv4, nhp_ary4[i],
memcpy(&api_nh->gate.ipv4, &nhp_ary4[i],
sizeof(api_nh->gate.ipv4)); sizeof(api_nh->gate.ipv4));
api_nh->type = NEXTHOP_TYPE_IPV4; api_nh->type = NEXTHOP_TYPE_IPV4;
break; break;
case AF_INET6: case AF_INET6:
nhp_ary6 = nhp_ary; memcpy(&api_nh->gate.ipv6, nhp_ary6[i],
memcpy(&api_nh->gate.ipv6, &nhp_ary6[i],
sizeof(api_nh->gate.ipv6)); sizeof(api_nh->gate.ipv6));
api_nh->type = NEXTHOP_TYPE_IPV6; api_nh->type = NEXTHOP_TYPE_IPV6;
break; break;