diff options
| author | Jafar Al-Gharaibeh <Jafaral@users.noreply.github.com> | 2017-10-16 23:35:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-16 23:35:16 -0500 |
| commit | 5bf59faffcb266e5527d451c7486af71bac5fa21 (patch) | |
| tree | 39dc582af40effefd1b78ecef7b836fa76700301 | |
| parent | 6660407d608ddfe754a9af223a6585d6ee2accfd (diff) | |
| parent | dd2395e1c63ff37ec82143e1a8d111e564c7c65e (diff) | |
Merge pull request #1300 from chiragshah6/mdev
ospf6d: fix ospf6d crash during sigterm/shutdown
| -rw-r--r-- | ospf6d/ospf6_main.c | 1 | ||||
| -rw-r--r-- | ospf6d/ospf6_route.c | 9 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c index 4641f41c33..9a6729ee2a 100644 --- a/ospf6d/ospf6_main.c +++ b/ospf6d/ospf6_main.c @@ -125,7 +125,6 @@ static void sigint(void) static void sigterm(void) { zlog_notice("Terminating on signal SIGTERM"); - ospf6_clean(); ospf6_exit(0); } diff --git a/ospf6d/ospf6_route.c b/ospf6d/ospf6_route.c index 5b78dda688..3c77c483ea 100644 --- a/ospf6d/ospf6_route.c +++ b/ospf6d/ospf6_route.c @@ -683,9 +683,9 @@ struct ospf6_route *ospf6_route_add(struct ospf6_route *route, /* Else, this is the brand new route regarding to the prefix */ if (IS_OSPF6_DEBUG_ROUTE(MEMORY)) - zlog_debug("%s %p: route add %p: brand new route", + zlog_debug("%s %p: route add %p %s : brand new route", ospf6_route_table_name(table), (void *)table, - (void *)route); + (void *)route, buf); else if (IS_OSPF6_DEBUG_ROUTE(TABLE)) zlog_debug("%s: route add: brand new route", ospf6_route_table_name(table)); @@ -760,9 +760,9 @@ void ospf6_route_remove(struct ospf6_route *route, prefix2str(&route->prefix, buf, sizeof(buf)); if (IS_OSPF6_DEBUG_ROUTE(MEMORY)) - zlog_debug("%s %p: route remove %p: %s rnode refcount %u", + zlog_debug("%s %p: route remove %p: %s refcount %u", ospf6_route_table_name(table), (void *)table, - (void *)route, buf, route->rnode->lock); + (void *)route, buf, route->lock); else if (IS_OSPF6_DEBUG_ROUTE(TABLE)) zlog_debug("%s: route remove: %s", ospf6_route_table_name(table), buf); @@ -801,6 +801,7 @@ void ospf6_route_remove(struct ospf6_route *route, SET_FLAG(route->flag, OSPF6_ROUTE_WAS_REMOVED); + /* Note hook_remove may call ospf6_route_remove */ if (table->hook_remove) (*table->hook_remove)(route); |