head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.54 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.52 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.50 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.48 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.46 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.44 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.42 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.40 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.38 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.36 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.34 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.32 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.30 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.28 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.26 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.24 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.22 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.20 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.18 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.16 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.14 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.12 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.10 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.8 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.6 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.4 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 buildlink2-base:1.1 buildlink2:1.1.0.2 netbsd-1-6:1.1.0.4 netbsd-1-6-RELEASE-base:1.1; locks; strict; comment @# @; 1.3 date 2002.09.13.08.41.52; author itojun; state dead; branches; next 1.2; 1.2 date 2002.08.25.21.50.26; author jlam; state Exp; branches; next 1.1; 1.1 date 2002.08.03.12.27.25; author itojun; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2002.08.03.12.27.25; author jlam; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2002.08.25.21.20.57; author jlam; state Exp; branches; next ; desc @@ 1.3 log @upgrade to 0.93b. o BGP connection problem is fixed. o EAGAIN check is added. @ text @$NetBSD: patch-ci,v 1.2 2002/08/25 21:50:26 jlam Exp $ diff -u1 ospf6d/ospf6_zebra.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_zebra.c --- ospf6d/ospf6_zebra.c Sun Jul 7 17:12:48 2002 +++ /home/itojun/work/zebra/zebra/ospf6d/ospf6_zebra.c Sat Aug 3 21:06:15 2002 @@@@ -435,6 +435,9 @@@@ - if (type == REMOVE && nexthop_list->count == 0) + if (type == REMOVE && nexthop_list->count != 0) + type = ADD; + else if (type == REMOVE && nexthop_list->count == 0) { - if (! ospf6_route_end (&route)) - ospf6_route_next (&route); + if (IS_OSPF6_DUMP_ZEBRA) + zlog_info ("ZEBRA: all nexthop with the selected path has gone"); + if (! memcmp (&request->route, &route.route, @@@@ -446,3 +449,3 @@@@ if (IS_OSPF6_DUMP_ZEBRA) - zlog_info ("ZEBRA: find alternative path to add"); + zlog_info ("ZEBRA: found alternative path to add"); @@@@ -478,2 +481,9 @@@@ zlog_info ("ZEBRA: can't find alternative path, remove"); + + if (IS_OSPF6_DUMP_ZEBRA) + { + zlog_info ("ZEBRA: Debug: walk over the route ?"); + ospf6_route_log_request ("Debug route", "***", &route); + ospf6_route_log_request ("Debug request", "***", request); + } @ 1.2 log @Merge packages from the buildlink2 branch back into the main trunk that have been converted to USE_BUILDLINK2. @ text @d1 1 a1 1 $NetBSD: patch-ci,v 1.1.2.1 2002/08/25 21:20:57 jlam Exp $ @ 1.1 log @pull critical patches in from zebra cvs repo (i have been asking for release of 0.93b, however, it's not happening yet) - bgpd: bug in capability negotiation - ospf6d: synchronize with zebra deamon correctly @ text @d1 1 a1 1 $NetBSD$ @ 1.1.2.1 log @file patch-ci was added on branch buildlink2 on 2002-08-25 21:20:57 +0000 @ text @d1 33 @ 1.1.2.2 log @Merge changes in the main trunk into the buildlink2 branch for those packages that have been converted to USE_BUILDLINK2. @ text @a0 33 $NetBSD: patch-ci,v 1.1.2.1 2002/08/25 21:20:57 jlam Exp $ diff -u1 ospf6d/ospf6_zebra.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_zebra.c --- ospf6d/ospf6_zebra.c Sun Jul 7 17:12:48 2002 +++ /home/itojun/work/zebra/zebra/ospf6d/ospf6_zebra.c Sat Aug 3 21:06:15 2002 @@@@ -435,6 +435,9 @@@@ - if (type == REMOVE && nexthop_list->count == 0) + if (type == REMOVE && nexthop_list->count != 0) + type = ADD; + else if (type == REMOVE && nexthop_list->count == 0) { - if (! ospf6_route_end (&route)) - ospf6_route_next (&route); + if (IS_OSPF6_DUMP_ZEBRA) + zlog_info ("ZEBRA: all nexthop with the selected path has gone"); + if (! memcmp (&request->route, &route.route, @@@@ -446,3 +449,3 @@@@ if (IS_OSPF6_DUMP_ZEBRA) - zlog_info ("ZEBRA: find alternative path to add"); + zlog_info ("ZEBRA: found alternative path to add"); @@@@ -478,2 +481,9 @@@@ zlog_info ("ZEBRA: can't find alternative path, remove"); + + if (IS_OSPF6_DUMP_ZEBRA) + { + zlog_info ("ZEBRA: Debug: walk over the route ?"); + ospf6_route_log_request ("Debug route", "***", &route); + ospf6_route_log_request ("Debug request", "***", request); + } @