diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2015-08-19 11:16:23 +0200 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2015-08-19 11:16:23 +0200 |
| commit | b5e76398de1d4468b4061d9ef57dd3154b2f745e (patch) | |
| tree | f1ef5836b1a67b6bc13da55bb21860ec6cb4e69f /proto/ospf/iface.c | |
| parent | c7b99a932cab1873042e356143ab71755920157a (diff) | |
OSPF: Fixes some issues with link detection
Thanks to Bernardo Figueiredo and Israel G. Lugo for the bugreport.
Diffstat (limited to 'proto/ospf/iface.c')
| -rw-r--r-- | proto/ospf/iface.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c index 9b0f7797..77ce839a 100644 --- a/proto/ospf/iface.c +++ b/proto/ospf/iface.c @@ -493,8 +493,11 @@ ospf_iface_add(struct object_lock *lock) ifa->flood_queue = mb_allocz(ifa->pool, ifa->flood_queue_size * sizeof(void *)); } - /* Do iface UP, unless there is no link and we use link detection */ - ospf_iface_sm(ifa, (ifa->check_link && !(ifa->iface->flags & IF_LINK_UP)) ? ISM_LOOP : ISM_UP); + /* Do iface UP, unless there is no link (then wait in LOOP state) */ + if (!ifa->check_link || (ifa->iface->flags & IF_LINK_UP)) + ospf_iface_sm(ifa, ISM_UP); + else + ospf_iface_chstate(ifa, OSPF_IS_LOOP); } static inline void |