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

Merge pull request #9004 from anlancs/fix-staticd-blackhole

Browse Source
This commit is contained in:
Igor Ryzhov 2021-07-10 09:26:58 +03:00 committed by GitHub
commit 91b35264c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
staticd/static_routes.c
View File

@ -278,6 +278,9 @@ static_add_nexthop(struct route_node *rn, struct static_path *pn, safi_t safi,
nh->type = type; nh->type = type;
nh->color = color; nh->color = color;
if (nh->type == STATIC_BLACKHOLE)
nh->bh_type = STATIC_BLACKHOLE_NULL;
nh->nh_vrf_id = nh_svrf ? nh_svrf->vrf->vrf_id : VRF_UNKNOWN; nh->nh_vrf_id = nh_svrf ? nh_svrf->vrf->vrf_id : VRF_UNKNOWN;
strlcpy(nh->nh_vrfname, nh_vrf, sizeof(nh->nh_vrfname)); strlcpy(nh->nh_vrfname, nh_vrf, sizeof(nh->nh_vrfname));
@ -325,6 +328,7 @@ static_add_nexthop(struct route_node *rn, struct static_path *pn, safi_t safi,
switch (nh->type) { switch (nh->type) {
case STATIC_IPV4_GATEWAY: case STATIC_IPV4_GATEWAY:
case STATIC_IPV6_GATEWAY: case STATIC_IPV6_GATEWAY:
case STATIC_BLACKHOLE:
break; break;
case STATIC_IPV4_GATEWAY_IFNAME: case STATIC_IPV4_GATEWAY_IFNAME:
case STATIC_IPV6_GATEWAY_IFNAME: case STATIC_IPV6_GATEWAY_IFNAME:
@ -336,9 +340,6 @@ static_add_nexthop(struct route_node *rn, struct static_path *pn, safi_t safi,
"Static Route using %s interface not installed because the interface does not exist in specified vrf", "Static Route using %s interface not installed because the interface does not exist in specified vrf",
ifname); ifname);
break;
case STATIC_BLACKHOLE:
nh->bh_type = STATIC_BLACKHOLE_NULL;
break; break;
case STATIC_IFNAME: case STATIC_IFNAME:
ifp = if_lookup_by_name(ifname, nh->nh_vrf_id); ifp = if_lookup_by_name(ifname, nh->nh_vrf_id);