diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-04-26 14:21:40 -0400 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-04-26 14:21:40 -0400 |
| commit | 99180b6290e40026bb269d12445d755c6e83824c (patch) | |
| tree | 2edd3748089054abd9bf75dd9ab1465ec5974e90 /ldpd/interface.c | |
| parent | 6aa210418ec5f573bc393a170b283e899a27b8e8 (diff) | |
| parent | e24287f11c8a0f84523cde9533340d78749aed3d (diff) | |
Merge remote-tracking branch 'origin/master' into EIGRP
Diffstat (limited to 'ldpd/interface.c')
| -rw-r--r-- | ldpd/interface.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ldpd/interface.c b/ldpd/interface.c index b7f473d396..7678152470 100644 --- a/ldpd/interface.c +++ b/ldpd/interface.c @@ -287,8 +287,9 @@ if_start(struct iface *iface, int af) } send_hello(HELLO_LINK, ia, NULL); - if_start_hello_timer(ia); + ia->state = IF_STA_ACTIVE; + return (0); } @@ -318,9 +319,11 @@ if_reset(struct iface *iface, int af) if_leave_ipv6_group(iface, &global.mcast_addr_v6); break; default: - fatalx("if_start: unknown af"); + fatalx("if_reset: unknown af"); } + ia->state = IF_STA_DOWN; + return (0); } @@ -367,13 +370,11 @@ if_update_af(struct iface_af *ia, int link_ok) !rtr_id_ok) return; - ia->state = IF_STA_ACTIVE; if_start(ia->iface, ia->af); } else if (ia->state == IF_STA_ACTIVE) { if (ia->enabled && link_ok && addr_ok && socket_ok && rtr_id_ok) return; - ia->state = IF_STA_DOWN; if_reset(ia->iface, ia->af); } } |