From cf1ce250d20003ae94c835e73e95e7442d7a5b53 Mon Sep 17 00:00:00 2001 From: Paul Jakma Date: Mon, 15 May 2006 10:46:07 +0000 Subject: [ospf6d] GNU Zebra #3562: ABR Crash fix, memory fixes, route table debugs 2006-02-22 Yasuhiro Ohara * valgrind check and memory fix * route table identification string added * ospf6d.h: version 0.9.7q --- ospf6d/ospf6_abr.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'ospf6d/ospf6_abr.c') diff --git a/ospf6d/ospf6_abr.c b/ospf6d/ospf6_abr.c index 833a1bc9..180a2048 100644 --- a/ospf6d/ospf6_abr.c +++ b/ospf6d/ospf6_abr.c @@ -538,6 +538,8 @@ ospf6_abr_examin_summary (struct ospf6_lsa *lsa, struct ospf6_area *oa) char buf[64]; int is_debug = 0; + memset (&prefix, 0, sizeof (prefix)); + if (lsa->header->type == htons (OSPF6_LSTYPE_INTER_PREFIX)) { struct ospf6_inter_prefix_lsa *prefix_lsa; @@ -593,7 +595,8 @@ ospf6_abr_examin_summary (struct ospf6_lsa *lsa, struct ospf6_area *oa) if (route->path.area_id == oa->area_id && route->path.origin.type == lsa->header->type && route->path.origin.id == lsa->header->id && - route->path.origin.adv_router == lsa->header->adv_router) + route->path.origin.adv_router == lsa->header->adv_router && + ! CHECK_FLAG (route->flag, OSPF6_ROUTE_WAS_REMOVED)) old = route; route = ospf6_route_next (route); } -- cgit v1.2.3 From 6ac29a51075def99217a4ab1015635db3b3e83ed Mon Sep 17 00:00:00 2001 From: Paul Jakma Date: Fri, 15 Aug 2008 13:45:30 +0100 Subject: [trivia] finish off static'ification of ospf6d and ripngd 2008-08-15 Paul Jakma * {ospf6d,ripngd}/*: Finish job of marking functions as static, or exporting declarations for them, to quell warning noise with Quagga's GCC default high-level of warning flags. Thus allowing remaining, more useful warnings to be more easily seen. --- ospf6d/ospf6_abr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ospf6d/ospf6_abr.c') diff --git a/ospf6d/ospf6_abr.c b/ospf6d/ospf6_abr.c index 180a2048..8224b109 100644 --- a/ospf6d/ospf6_abr.c +++ b/ospf6d/ospf6_abr.c @@ -472,7 +472,7 @@ ospf6_abr_originate_summary_to_area (struct ospf6_route *route, ospf6_lsa_originate_area (lsa, area); } -void +static void ospf6_abr_range_update (struct ospf6_route *range) { u_int32_t cost = 0; @@ -762,7 +762,7 @@ ospf6_abr_reimport (struct ospf6_area *oa) /* Display functions */ -int +static int ospf6_inter_area_prefix_lsa_show (struct vty *vty, struct ospf6_lsa *lsa) { struct ospf6_inter_prefix_lsa *prefix_lsa; @@ -787,7 +787,7 @@ ospf6_inter_area_prefix_lsa_show (struct vty *vty, struct ospf6_lsa *lsa) return 0; } -int +static int ospf6_inter_area_router_lsa_show (struct vty *vty, struct ospf6_lsa *lsa) { struct ospf6_inter_router_lsa *router_lsa; @@ -841,7 +841,7 @@ config_write_ospf6_debug_abr (struct vty *vty) } void -install_element_ospf6_debug_abr () +install_element_ospf6_debug_abr (void) { install_element (ENABLE_NODE, &debug_ospf6_abr_cmd); install_element (ENABLE_NODE, &no_debug_ospf6_abr_cmd); @@ -864,7 +864,7 @@ struct ospf6_lsa_handler inter_router_handler = }; void -ospf6_abr_init () +ospf6_abr_init (void) { ospf6_install_lsa_handler (&inter_prefix_handler); ospf6_install_lsa_handler (&inter_router_handler); -- cgit v1.2.3