diff options
| author | Igor Ryzhov <iryzhov@nfware.com> | 2021-09-06 12:36:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-06 12:36:54 +0300 |
| commit | 0f90ef494a09353340ce9d667f46aaef78919c11 (patch) | |
| tree | 1ba424cc37e2586baba44296fe15d9c6ff48143e | |
| parent | 5c2ef8710460f14f8573fe99eea15bcc7c4cd4c2 (diff) | |
| parent | 3ebc5e4be9343f6f1e35a3d324234caf0a07b5d9 (diff) | |
Merge pull request #9521 from opensourcerouting/ospf6d-gr-fixes
ospf6d: minor GR fixes
| -rw-r--r-- | ospf6d/ospf6_gr_helper.c | 2 | ||||
| -rw-r--r-- | ospf6d/ospf6_message.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ospf6d/ospf6_gr_helper.c b/ospf6d/ospf6_gr_helper.c index d0536087c3..76496c050f 100644 --- a/ospf6d/ospf6_gr_helper.c +++ b/ospf6d/ospf6_gr_helper.c @@ -1373,6 +1373,6 @@ int config_write_ospf6_gr_helper(struct vty *vty, struct ospf6 *ospf6) int config_write_ospf6_debug_gr_helper(struct vty *vty) { if (IS_DEBUG_OSPF6_GR) - vty_out(vty, "debug ospf6 gr helper\n"); + vty_out(vty, "debug ospf6 graceful-restart\n"); return 0; } diff --git a/ospf6d/ospf6_message.c b/ospf6d/ospf6_message.c index cd73e3d406..3dcc74589a 100644 --- a/ospf6d/ospf6_message.c +++ b/ospf6d/ospf6_message.c @@ -515,12 +515,12 @@ static void ospf6_hello_recv(struct in6_addr *src, struct in6_addr *dst, if (twoway) thread_execute(master, twoway_received, on, 0); else { - if (IS_DEBUG_OSPF6_GR) - zlog_debug( - "%s, Received oneway hello from RESTARTER so ignore here.", - __PRETTY_FUNCTION__); - - if (!OSPF6_GR_IS_ACTIVE_HELPER(on)) { + if (OSPF6_GR_IS_ACTIVE_HELPER(on)) { + if (IS_DEBUG_OSPF6_GR) + zlog_debug( + "%s, Received oneway hello from RESTARTER so ignore here.", + __PRETTY_FUNCTION__); + } else { /* If the router is DR_OTHER, RESTARTER will not wait * until it receives the hello from it if it receives * from DR and BDR. |