diff options
| author | David Lamparter <equinox@diac24.net> | 2018-08-24 04:19:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-24 04:19:02 +0200 |
| commit | ff0c9e7a0abf46750b40a41464ecd7aabea0e97c (patch) | |
| tree | d2be957988ae75889b55dd385d45916f7b237c7c /pimd/pim_pim.c | |
| parent | 3391232343ee5a92b17755bd29d3a246a660f3be (diff) | |
| parent | fec4ca191ef4e7d9576feba756f728b21819ec45 (diff) | |
Merge pull request #2896 from dslicenc/zebra_select_vrf
zebra: if multiple connecteds, select loopback or vrf if present
Diffstat (limited to 'pimd/pim_pim.c')
| -rw-r--r-- | pimd/pim_pim.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pimd/pim_pim.c b/pimd/pim_pim.c index b103da2e1b..7113d5405e 100644 --- a/pimd/pim_pim.c +++ b/pimd/pim_pim.c @@ -655,7 +655,7 @@ static int pim_hello_send(struct interface *ifp, uint16_t holdtime) { struct pim_interface *pim_ifp = ifp->info; - if (pim_if_is_loopback(ifp)) + if (if_is_loopback_or_vrf(ifp)) return 0; if (hello_send(ifp, holdtime)) { @@ -757,7 +757,7 @@ void pim_hello_restart_triggered(struct interface *ifp) /* * No need to ever start loopback or vrf device hello's */ - if (pim_if_is_loopback(ifp)) + if (if_is_loopback_or_vrf(ifp)) return; /* |