diff options
| author | Russ White <russ@riw.us> | 2021-10-07 01:01:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-07 01:01:52 +0200 |
| commit | b1003f64b2c41ece17993c8e13b2810a6c55f1a1 (patch) | |
| tree | aed5e548f2cf20fed41c4d826d63c59b58f2515f /ospfd | |
| parent | Merge pull request #9699 from manojvn/379032-dev (diff) | |
| parent | *: cleanup interface loopback/vrf check (diff) | |
| download | frr-b1003f64b2c41ece17993c8e13b2810a6c55f1a1.tar.xz frr-b1003f64b2c41ece17993c8e13b2810a6c55f1a1.zip | |
Merge pull request #9698 from idryzhov/cleanup-loopback-or-vrf
*: cleanup interface loopback/vrf check
Diffstat (limited to 'ospfd')
| -rw-r--r-- | ospfd/ospf_interface.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c index eb7a8348e..81cc34600 100644 --- a/ospfd/ospf_interface.c +++ b/ospfd/ospf_interface.c @@ -477,7 +477,7 @@ struct ospf_interface *ospf_if_lookup_recv_if(struct ospf *ospf, if (oi->type == OSPF_IFTYPE_VIRTUALLINK) continue; - if (if_is_loopback(oi->ifp) || if_is_vrf(oi->ifp)) + if (if_is_loopback_or_vrf(oi->ifp)) continue; if (CHECK_FLAG(oi->connected->flags, ZEBRA_IFA_UNNUMBERED)) @@ -719,7 +719,7 @@ static int ospf_if_delete_hook(struct interface *ifp) int ospf_if_is_enable(struct ospf_interface *oi) { - if (!(if_is_loopback(oi->ifp) || if_is_vrf(oi->ifp))) + if (!(if_is_loopback_or_vrf(oi->ifp))) if (if_is_up(oi->ifp)) return 1; @@ -1291,7 +1291,7 @@ uint8_t ospf_default_iftype(struct interface *ifp) { if (if_is_pointopoint(ifp)) return OSPF_IFTYPE_POINTOPOINT; - else if (if_is_loopback(ifp) || if_is_vrf(ifp)) + else if (if_is_loopback_or_vrf(ifp)) return OSPF_IFTYPE_LOOPBACK; else return OSPF_IFTYPE_BROADCAST; |