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

Merge pull request #10446 from anlancs/staticd-cleanup

Browse Source 
staticd: small cleanup
This commit is contained in:
Igor Ryzhov 2022-02-01 13:33:13 +03:00 committed by GitHub
commit 4adbab9b23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
staticd/static_routes.c
View File

@ -335,6 +335,7 @@ struct static_nexthop *static_add_nexthop(struct static_path *pn,
break; break;
case STATIC_IPV4_GATEWAY_IFNAME: case STATIC_IPV4_GATEWAY_IFNAME:
case STATIC_IPV6_GATEWAY_IFNAME: case STATIC_IPV6_GATEWAY_IFNAME:
case STATIC_IFNAME:
ifp = if_lookup_by_name(ifname, nh->nh_vrf_id); ifp = if_lookup_by_name(ifname, nh->nh_vrf_id);
if (ifp && ifp->ifindex != IFINDEX_INTERNAL) if (ifp && ifp->ifindex != IFINDEX_INTERNAL)
nh->ifindex = ifp->ifindex; nh->ifindex = ifp->ifindex;
@ -342,16 +343,6 @@ struct static_nexthop *static_add_nexthop(struct static_path *pn,
zlog_warn( zlog_warn(
"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_IFNAME:
ifp = if_lookup_by_name(ifname, nh->nh_vrf_id);
if (ifp && ifp->ifindex != IFINDEX_INTERNAL) {
nh->ifindex = ifp->ifindex;
} else
zlog_warn(
"Static Route using %s interface not installed because the interface does not exist in specified vrf",
ifname);
break; break;
} }

2
staticd/static_vty.c
View File

@ -140,8 +140,6 @@ static int static_route_leak(struct vty *vty, const char *svrf,
/* Administrative distance. */ /* Administrative distance. */
if (distance_str) if (distance_str)
distance = atoi(distance_str); distance = atoi(distance_str);
else
distance = ZEBRA_STATIC_DISTANCE_DEFAULT;
/* tag */ /* tag */
if (tag_str) if (tag_str)