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.51;	author itojun;	state dead;
branches;
next	1.2;

1.2
date	2002.08.25.21.50.25;	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.56;	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-ch,v 1.2 2002/08/25 21:50:25 jlam Exp $

diff -u1 ospf6d/ospf6_route.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_route.c
--- ospf6d/ospf6_route.c	Sun Jul  7 17:12:48 2002
+++ /home/itojun/work/zebra/zebra/ospf6d/ospf6_route.c	Sat Aug  3 21:06:12 2002
@@@@ -1015,2 +1015,6 @@@@
 
+  u_int route_count = 0;
+  u_int path_count = 0;
+  u_int route_redundant = 0;
+
   memset (&prefix, 0, sizeof (struct prefix));
@@@@ -1103,3 +1107,5 @@@@
     {
-      if (! node->info)
+      struct ospf6_route_node *route = node->info;
+
+      if (! route)
         continue;
@@@@ -1107,6 +1113,15 @@@@
       if (detail)
-        ospf6_route_show_detail (vty, node->info);
+        ospf6_route_show_detail (vty, route);
       else
-        ospf6_route_show (vty, node->info);
+        ospf6_route_show (vty, route);
+
+      route_count++;
+      path_count += route->path_list->count;
+      if (route->path_list->count > 1)
+        route_redundant++;
     }
+
+  vty_out (vty, "===========%s", VTY_NEWLINE);
+  vty_out (vty, "Route: %d Path: %d Redundant: %d%s",
+           route_count, path_count, route_redundant, VTY_NEWLINE);
 
@


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-ch,v 1.1.2.1 2002/08/25 21:20:56 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-ch was added on branch buildlink2 on 2002-08-25 21:20:56 +0000
@
text
@d1 37
@


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 37
$NetBSD: patch-ch,v 1.1.2.1 2002/08/25 21:20:56 jlam Exp $

diff -u1 ospf6d/ospf6_route.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_route.c
--- ospf6d/ospf6_route.c	Sun Jul  7 17:12:48 2002
+++ /home/itojun/work/zebra/zebra/ospf6d/ospf6_route.c	Sat Aug  3 21:06:12 2002
@@@@ -1015,2 +1015,6 @@@@
 
+  u_int route_count = 0;
+  u_int path_count = 0;
+  u_int route_redundant = 0;
+
   memset (&prefix, 0, sizeof (struct prefix));
@@@@ -1103,3 +1107,5 @@@@
     {
-      if (! node->info)
+      struct ospf6_route_node *route = node->info;
+
+      if (! route)
         continue;
@@@@ -1107,6 +1113,15 @@@@
       if (detail)
-        ospf6_route_show_detail (vty, node->info);
+        ospf6_route_show_detail (vty, route);
       else
-        ospf6_route_show (vty, node->info);
+        ospf6_route_show (vty, route);
+
+      route_count++;
+      path_count += route->path_list->count;
+      if (route->path_list->count > 1)
+        route_redundant++;
     }
+
+  vty_out (vty, "===========%s", VTY_NEWLINE);
+  vty_out (vty, "Route: %d Path: %d Redundant: %d%s",
+           route_count, path_count, route_redundant, VTY_NEWLINE);
 
@