proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 13:33:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1300 from chiragshah6/mdev

Browse Source 
ospf6d: fix ospf6d crash during sigterm/shutdown
This commit is contained in:
Jafar Al-Gharaibeh 2017-10-16 23:35:16 -05:00 committed by GitHub
commit 5bf59faffc
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ospf6d/ospf6_main.c
View File

@ -125,7 +125,6 @@ static void sigint(void)
static void sigterm(void) static void sigterm(void)
{ {
zlog_notice("Terminating on signal SIGTERM"); zlog_notice("Terminating on signal SIGTERM");
ospf6_clean();
ospf6_exit(0); ospf6_exit(0);
} }

9
ospf6d/ospf6_route.c
View File

@ -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 */ /* Else, this is the brand new route regarding to the prefix */
if (IS_OSPF6_DEBUG_ROUTE(MEMORY)) 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, ospf6_route_table_name(table), (void *)table,
(void *)route); (void *)route, buf);
else if (IS_OSPF6_DEBUG_ROUTE(TABLE)) else if (IS_OSPF6_DEBUG_ROUTE(TABLE))
zlog_debug("%s: route add: brand new route", zlog_debug("%s: route add: brand new route",
ospf6_route_table_name(table)); ospf6_route_table_name(table));
@ -760,9 +760,9 @@ void ospf6_route_remove(struct ospf6_route *route,
prefix2str(&route->prefix, buf, sizeof(buf)); prefix2str(&route->prefix, buf, sizeof(buf));
if (IS_OSPF6_DEBUG_ROUTE(MEMORY)) 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, 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)) else if (IS_OSPF6_DEBUG_ROUTE(TABLE))
zlog_debug("%s: route remove: %s", zlog_debug("%s: route remove: %s",
ospf6_route_table_name(table), buf); 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); SET_FLAG(route->flag, OSPF6_ROUTE_WAS_REMOVED);
/* Note hook_remove may call ospf6_route_remove */
if (table->hook_remove) if (table->hook_remove)
(*table->hook_remove)(route); (*table->hook_remove)(route);