diff options
| author | Renato Westphal <renato@opensourcerouting.org> | 2017-04-22 17:03:14 +0200 |
|---|---|---|
| committer | Renato Westphal <renato@opensourcerouting.org> | 2017-04-26 15:37:18 +0200 |
| commit | 8a26d0cf73e5f87b20aa47ed3f1465eab15da18a (patch) | |
| tree | 578db3eb18fd3b1eed8fce7fded7b9016b4f9f2b /ldpd/interface.c | |
| parent | ldpd: allow targeted neighbors over any interface (diff) | |
| download | frr-8a26d0cf73e5f87b20aa47ed3f1465eab15da18a.tar.xz frr-8a26d0cf73e5f87b20aa47ed3f1465eab15da18a.zip | |
ldpd: fix bug when changing the transport address
When the transport address is changed, all interfaces and targeted
neighbors are temporary disabled in the ldpe process until new sockets
bound to the new transport address are received from the parent.
This patch fixes a problem in which adjacencies weren't being removed
after the associated targeted neighbors were disabled. This was causing
ldpd not to set some MD5 sockoptions for new neighbors are thus preventing
MD5-protected sessions to come up after a change in the transport-address.
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
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 b7f473d39..767815247 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); } } |