summaryrefslogtreecommitdiff
path: root/net/zebra/patches
diff options
context:
space:
mode:
Diffstat (limited to 'net/zebra/patches')
-rw-r--r--net/zebra/patches/patch-aa18
-rw-r--r--net/zebra/patches/patch-ab18
-rw-r--r--net/zebra/patches/patch-ac18
-rw-r--r--net/zebra/patches/patch-ad18
-rw-r--r--net/zebra/patches/patch-ae18
-rw-r--r--net/zebra/patches/patch-af18
-rw-r--r--net/zebra/patches/patch-ba11
-rw-r--r--net/zebra/patches/patch-bb13
-rw-r--r--net/zebra/patches/patch-bc12
-rw-r--r--net/zebra/patches/patch-bd49
-rw-r--r--net/zebra/patches/patch-ca22
-rw-r--r--net/zebra/patches/patch-cc30
-rw-r--r--net/zebra/patches/patch-cd16
-rw-r--r--net/zebra/patches/patch-ce10
-rw-r--r--net/zebra/patches/patch-cf25
-rw-r--r--net/zebra/patches/patch-cg23
-rw-r--r--net/zebra/patches/patch-ch37
-rw-r--r--net/zebra/patches/patch-ci33
-rw-r--r--net/zebra/patches/patch-cj10
19 files changed, 327 insertions, 72 deletions
diff --git a/net/zebra/patches/patch-aa b/net/zebra/patches/patch-aa
index edcdfc43e5f..fd8a93451b7 100644
--- a/net/zebra/patches/patch-aa
+++ b/net/zebra/patches/patch-aa
@@ -1,18 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2000/08/24 01:25:38 kim Exp $
+$NetBSD: patch-aa,v 1.5.2.1 2002/08/25 21:20:41 jlam Exp $
---- bgpd/Makefile.am.orig Thu Aug 17 04:27:58 2000
-+++ bgpd/Makefile.am Wed Aug 23 16:19:15 2000
-@@ -4,6 +4,8 @@
- DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
- INSTALL_SDATA=@INSTALL@ -m 600
+--- bgpd/Makefile.am.orig Wed Jun 19 04:05:04 2002
++++ bgpd/Makefile.am Wed Jul 10 08:34:31 2002
+@@ -30,15 +30,17 @@
+
+ EXTRA_DIST = $(sysconf_DATA) BGP4-MIB.txt
+sysconfdatadir=$(datadir)/examples/zebra
+
- noinst_LIBRARIES = libbgp.a
- sbin_PROGRAMS = bgpd
- #noinst_PROGRAMS = bgp_btoa
-@@ -36,14 +38,14 @@
-
install-sysconfDATA: $(sysconf_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@@ -30,4 +25,3 @@ $NetBSD: patch-aa,v 1.5 2000/08/24 01:25:38 kim Exp $
+ $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
fi; fi; \
done
-
diff --git a/net/zebra/patches/patch-ab b/net/zebra/patches/patch-ab
index 28c972e950d..ee02c1f0ab9 100644
--- a/net/zebra/patches/patch-ab
+++ b/net/zebra/patches/patch-ab
@@ -1,18 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2000/08/24 01:25:42 kim Exp $
+$NetBSD: patch-ab,v 1.3.2.1 2002/08/25 21:20:42 jlam Exp $
---- ospf6d/Makefile.am.orig Thu Aug 17 04:27:37 2000
-+++ ospf6d/Makefile.am Wed Aug 23 16:21:19 2000
-@@ -4,6 +4,8 @@
- DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
- INSTALL_SDATA=@INSTALL@ -m 600
+--- ospf6d/Makefile.am.orig Sat Jun 29 15:20:39 2002
++++ ospf6d/Makefile.am Wed Jul 10 08:34:31 2002
+@@ -34,15 +34,17 @@
+
+ EXTRA_DIST = $(sysconf_DATA)
+sysconfdatadir=$(datadir)/examples/zebra
+
- noinst_LIBRARIES = libospf6.a
- sbin_PROGRAMS = ospf6d
-
-@@ -33,14 +35,14 @@
-
install-sysconfDATA: $(sysconf_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@@ -30,4 +25,3 @@ $NetBSD: patch-ab,v 1.3 2000/08/24 01:25:42 kim Exp $
+ $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
fi; fi; \
done
-
diff --git a/net/zebra/patches/patch-ac b/net/zebra/patches/patch-ac
index 05d0735c369..7c6ef54bf78 100644
--- a/net/zebra/patches/patch-ac
+++ b/net/zebra/patches/patch-ac
@@ -1,18 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2000/08/24 01:25:44 kim Exp $
+$NetBSD: patch-ac,v 1.1.2.1 2002/08/25 21:20:43 jlam Exp $
---- ospfd/Makefile.am.orig Thu Aug 17 04:27:22 2000
-+++ ospfd/Makefile.am Wed Aug 23 16:22:52 2000
-@@ -4,6 +4,8 @@
- DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
- INSTALL_SDATA=@INSTALL@ -m 600
+--- ospfd/Makefile.am.orig Wed Jun 19 04:06:08 2002
++++ ospfd/Makefile.am Wed Jul 10 08:34:31 2002
+@@ -30,15 +30,17 @@
+
+ EXTRA_DIST = $(sysconf_DATA) OSPF-MIB.txt OSPF-TRAP-MIB.txt
+sysconfdatadir=$(datadir)/examples/zebra
+
- noinst_LIBRARIES = libospf.a
- sbin_PROGRAMS = ospfd
-
-@@ -30,14 +32,14 @@
-
install-sysconfDATA: $(sysconf_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@@ -30,4 +25,3 @@ $NetBSD: patch-ac,v 1.1 2000/08/24 01:25:44 kim Exp $
+ $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
fi; fi; \
done
-
diff --git a/net/zebra/patches/patch-ad b/net/zebra/patches/patch-ad
index e70ec8d7424..d05d18d0d3c 100644
--- a/net/zebra/patches/patch-ad
+++ b/net/zebra/patches/patch-ad
@@ -1,18 +1,13 @@
-$NetBSD: patch-ad,v 1.1 2000/08/24 01:25:45 kim Exp $
+$NetBSD: patch-ad,v 1.1.2.1 2002/08/25 21:20:43 jlam Exp $
---- ripd/Makefile.am.orig Thu Aug 17 04:26:57 2000
-+++ ripd/Makefile.am Wed Aug 23 16:23:48 2000
-@@ -4,6 +4,8 @@
- DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
- INSTALL_SDATA=@INSTALL@ -m 600
+--- ripd/Makefile.am.orig Wed Jun 19 04:06:18 2002
++++ ripd/Makefile.am Wed Jul 10 08:34:31 2002
+@@ -23,15 +23,17 @@
+
+ EXTRA_DIST = $(sysconf_DATA) RIPv2-MIB.txt
+sysconfdatadir=$(datadir)/examples/zebra
+
- noinst_LIBRARIES = librip.a
- sbin_PROGRAMS = ripd
-
-@@ -25,14 +27,14 @@
-
install-sysconfDATA: $(sysconf_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@@ -30,4 +25,3 @@ $NetBSD: patch-ad,v 1.1 2000/08/24 01:25:45 kim Exp $
+ $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
fi; fi; \
done
-
diff --git a/net/zebra/patches/patch-ae b/net/zebra/patches/patch-ae
index fef09c4fde5..ffb5066133e 100644
--- a/net/zebra/patches/patch-ae
+++ b/net/zebra/patches/patch-ae
@@ -1,18 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2000/08/24 01:25:46 kim Exp $
+$NetBSD: patch-ae,v 1.1.2.1 2002/08/25 21:20:44 jlam Exp $
---- ripngd/Makefile.am.orig Thu Aug 17 04:27:11 2000
-+++ ripngd/Makefile.am Wed Aug 23 16:24:39 2000
-@@ -4,6 +4,8 @@
- DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
- INSTALL_SDATA=@INSTALL@ -m 600
+--- ripngd/Makefile.am.orig Wed Jun 19 04:06:33 2002
++++ ripngd/Makefile.am Wed Jul 10 08:34:31 2002
+@@ -23,15 +23,17 @@
+
+ EXTRA_DIST = $(sysconf_DATA)
+sysconfdatadir=$(datadir)/examples/zebra
+
- noinst_LIBRARIES = libripng.a
- sbin_PROGRAMS = ripngd
-
-@@ -25,14 +27,14 @@
-
install-sysconfDATA: $(sysconf_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@@ -30,4 +25,3 @@ $NetBSD: patch-ae,v 1.1 2000/08/24 01:25:46 kim Exp $
+ $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
fi; fi; \
done
-
diff --git a/net/zebra/patches/patch-af b/net/zebra/patches/patch-af
index 8db65252a52..750e463f5c4 100644
--- a/net/zebra/patches/patch-af
+++ b/net/zebra/patches/patch-af
@@ -1,18 +1,13 @@
-$NetBSD: patch-af,v 1.2 2001/01/11 05:34:16 itojun Exp $
+$NetBSD: patch-af,v 1.2.2.1 2002/08/25 21:20:45 jlam Exp $
---- zebra/Makefile.am.orig Wed Jan 10 10:11:11 2001
-+++ zebra/Makefile.am Thu Jan 11 13:57:23 2001
-@@ -4,6 +4,8 @@
- DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -DMULTIPATH_NUM=@MULTIPATH_NUM@
- INSTALL_SDATA=@INSTALL@ -m 600
+--- zebra/Makefile.am.orig Wed Jun 19 08:17:32 2002
++++ zebra/Makefile.am Wed Jul 10 08:34:31 2002
+@@ -43,15 +43,17 @@
+ #client : client_main.o ../lib/libzebra.a
+ # $(CC) -g -o client client_main.o ../lib/libzebra.a $(LIBS) $(LIB_IPV6)
+sysconfdatadir=$(datadir)/examples/zebra
+
- LIB_IPV6 = @LIB_IPV6@
-
- ipforward = @IPFORWARD@
-@@ -50,14 +52,14 @@
-
install-sysconfDATA: $(sysconf_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@@ -30,4 +25,3 @@ $NetBSD: patch-af,v 1.2 2001/01/11 05:34:16 itojun Exp $
+ $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
fi; fi; \
done
-
diff --git a/net/zebra/patches/patch-ba b/net/zebra/patches/patch-ba
new file mode 100644
index 00000000000..36c96b6a9fc
--- /dev/null
+++ b/net/zebra/patches/patch-ba
@@ -0,0 +1,11 @@
+$NetBSD: patch-ba,v 1.1.2.2 2002/08/25 21:20:46 jlam Exp $
+
+diff -u1 bgpd/bgp_fsm.c /home/itojun/work/zebra/zebra/bgpd/bgp_fsm.c
+--- bgpd/bgp_fsm.c Wed Jun 19 17:05:38 2002
++++ /home/itojun/work/zebra/zebra/bgpd/bgp_fsm.c Sat Aug 3 21:05:48 2002
+@@ -348,2 +348,5 @@
+
++ /* Send capability. */
++ SET_FLAG (peer->sflags, PEER_STATUS_CAPABILITY_OPEN);
++
+ /* Delete all existing events of the peer. */
diff --git a/net/zebra/patches/patch-bb b/net/zebra/patches/patch-bb
new file mode 100644
index 00000000000..dcfc0267509
--- /dev/null
+++ b/net/zebra/patches/patch-bb
@@ -0,0 +1,13 @@
+$NetBSD: patch-bb,v 1.1.2.2 2002/08/25 21:20:47 jlam Exp $
+
+diff -u1 bgpd/bgp_open.c /home/itojun/work/zebra/zebra/bgpd/bgp_open.c
+--- bgpd/bgp_open.c Wed Jun 19 17:05:38 2002
++++ /home/itojun/work/zebra/zebra/bgpd/bgp_open.c Sat Aug 3 21:05:48 2002
+@@ -670,7 +670,2 @@
+
+- /* Do not send capability. */
+- if (! CHECK_FLAG (peer->sflags, PEER_STATUS_CAPABILITY_OPEN)
+- || CHECK_FLAG (peer->flags, PEER_FLAG_DONT_CAPABILITY))
+- return;
+-
+ /* When the peer is IPv4 unicast only, do not send capability. */
diff --git a/net/zebra/patches/patch-bc b/net/zebra/patches/patch-bc
new file mode 100644
index 00000000000..a73b82ffda1
--- /dev/null
+++ b/net/zebra/patches/patch-bc
@@ -0,0 +1,12 @@
+$NetBSD: patch-bc,v 1.1.2.2 2002/08/25 21:20:48 jlam Exp $
+
+diff -u1 bgpd/bgp_packet.c /home/itojun/work/zebra/zebra/bgpd/bgp_packet.c
+--- bgpd/bgp_packet.c Sat Jun 29 15:20:39 2002
++++ /home/itojun/work/zebra/zebra/bgpd/bgp_packet.c Sat Aug 3 21:05:49 2002
+@@ -758,3 +758,5 @@
+ /* Set capability code. */
+- bgp_open_capability (s, peer);
++ if (CHECK_FLAG (peer->sflags, PEER_STATUS_CAPABILITY_OPEN) &&
++ ! CHECK_FLAG (peer->flags, PEER_FLAG_DONT_CAPABILITY))
++ bgp_open_capability (s, peer);
+
diff --git a/net/zebra/patches/patch-bd b/net/zebra/patches/patch-bd
new file mode 100644
index 00000000000..12094a627be
--- /dev/null
+++ b/net/zebra/patches/patch-bd
@@ -0,0 +1,49 @@
+$NetBSD: patch-bd,v 1.1.2.2 2002/08/25 21:20:49 jlam Exp $
+
+diff -u1 bgpd/bgp_vty.c /home/itojun/work/zebra/zebra/bgpd/bgp_vty.c
+--- bgpd/bgp_vty.c Mon Jul 8 22:31:01 2002
++++ /home/itojun/work/zebra/zebra/bgpd/bgp_vty.c Sat Aug 3 21:05:54 2002
+@@ -98,8 +98,2 @@
+
+- if (peer_address_self_check (&su))
+- {
+- vty_out (vty, "%% Cannot configure the local system as neighbor%s", VTY_NEWLINE);
+- return NULL;
+- }
+-
+ peer = peer_lookup (bgp, &su);
+@@ -128,8 +122,2 @@
+ {
+- if (peer_address_self_check (&su))
+- {
+- vty_out (vty, "%% Cannot configure the local system as neighbor%s", VTY_NEWLINE);
+- return NULL;
+- }
+-
+ peer = peer_lookup (bgp, &su);
+@@ -1123,3 +1111,4 @@
+ {
+- vty_out (vty, "%% Cannot configure the local system as neighbor%s", VTY_NEWLINE);
++ vty_out (vty, "%% Can not configure the local system as neighbor%s",
++ VTY_NEWLINE);
+ return CMD_WARNING;
+@@ -1200,9 +1189,2 @@
+ {
+- if (peer_address_self_check (&su))
+- {
+- vty_out (vty, "%% Cannot configure the local system as neighbor%s",
+- VTY_NEWLINE);
+- return CMD_WARNING;
+- }
+-
+ peer = peer_lookup (vty->index, &su);
+@@ -1410,2 +1392,9 @@
+ vty_out (vty, "%% Configure the peer-group first%s", VTY_NEWLINE);
++ return CMD_WARNING;
++ }
++
++ if (peer_address_self_check (&su))
++ {
++ vty_out (vty, "%% Can not configure the local system as neighbor%s",
++ VTY_NEWLINE);
+ return CMD_WARNING;
diff --git a/net/zebra/patches/patch-ca b/net/zebra/patches/patch-ca
new file mode 100644
index 00000000000..93a4ed0ff6c
--- /dev/null
+++ b/net/zebra/patches/patch-ca
@@ -0,0 +1,22 @@
+$NetBSD: patch-ca,v 1.1.2.2 2002/08/25 21:20:49 jlam Exp $
+
+diff -u1 ospf6d/ChangeLog /home/itojun/work/zebra/zebra/ospf6d/ChangeLog
+--- ospf6d/ChangeLog Mon Jul 8 22:31:02 2002
++++ /home/itojun/work/zebra/zebra/ospf6d/ChangeLog Sat Aug 3 21:06:01 2002
+@@ -1 +1,16 @@
++2002-07-14 Yasuhiro Ohara <yasu@sfc.wide.ad.jp>
++
++ * ospf6_dbex.c: bug that ospf6d fails to refresh self-originated
++ LSA if he have not the LSA before has been fixed.
++ * ospf6_asbr.c: bug of failing removing ASE LSA when remove
++ message arrived from zebra has been fixed.
++ * version: 0.9.6k
++
++2002-07-13 Yasuhiro Ohara <yasu@sfc.wide.ad.jp>
++
++ * ospf6_zebra.c: bug reported [zebra 14642] fixed.
++ The bug was related to the synchronization between zebra
++ and ospf6d. Now synchronization will be correctly done.
++ * version: 0.9.6j
++
+ 2002-07-07 Yasuhiro Ohara <yasu@sfc.wide.ad.jp>
diff --git a/net/zebra/patches/patch-cc b/net/zebra/patches/patch-cc
new file mode 100644
index 00000000000..f0b3577a829
--- /dev/null
+++ b/net/zebra/patches/patch-cc
@@ -0,0 +1,30 @@
+$NetBSD: patch-cc,v 1.1.2.2 2002/08/25 21:20:50 jlam Exp $
+
+diff -u1 ospf6d/ospf6_area.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_area.c
+--- ospf6d/ospf6_area.c Mon Jul 8 22:31:02 2002
++++ /home/itojun/work/zebra/zebra/ospf6d/ospf6_area.c Sat Aug 3 21:06:04 2002
+@@ -102,24 +102,2 @@
+ void
+-ospf6_area_intra_topo_add (struct ospf6_route_req *topo_entry)
+-{
+- if (topo_entry->route.type == OSPF6_DEST_TYPE_ROUTER)
+- {
+- if (CHECK_FLAG (topo_entry->path.router_bits, OSPF6_ROUTER_LSA_BIT_B))
+- ospf6_abr_abr_entry_add (topo_entry);
+- }
+- CALL_ADD_HOOK (&intra_topology_hook, topo_entry);
+-}
+-
+-void
+-ospf6_area_intra_topo_remove (struct ospf6_route_req *topo_entry)
+-{
+- if (topo_entry->route.type == OSPF6_DEST_TYPE_ROUTER)
+- {
+- if (CHECK_FLAG (topo_entry->path.router_bits, OSPF6_ROUTER_LSA_BIT_E))
+- ospf6_abr_abr_entry_add (topo_entry);
+- }
+- CALL_REMOVE_HOOK (&intra_topology_hook, topo_entry);
+-}
+-
+-void
+ ospf6_area_route_add (void *data)
diff --git a/net/zebra/patches/patch-cd b/net/zebra/patches/patch-cd
new file mode 100644
index 00000000000..af17a16c3cd
--- /dev/null
+++ b/net/zebra/patches/patch-cd
@@ -0,0 +1,16 @@
+$NetBSD: patch-cd,v 1.1.2.2 2002/08/25 21:20:51 jlam Exp $
+
+diff -u1 ospf6d/ospf6_asbr.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_asbr.c
+--- ospf6d/ospf6_asbr.c Mon Jul 8 22:31:02 2002
++++ /home/itojun/work/zebra/zebra/ospf6d/ospf6_asbr.c Sat Aug 3 21:06:04 2002
+@@ -119,3 +119,3 @@
+ lsa = ospf6_lsdb_lookup_lsdb (htons (OSPF6_LSA_TYPE_AS_EXTERNAL),
+- htonl (route->path.origin.id),
++ route->path.origin.id,
+ ospf6->router_id, ospf6->lsdb);
+@@ -419,2 +419,5 @@
+ assert (ospf6);
++
++ if (IS_OSPF6_DUMP_ASBR)
++ zlog_info ("ASBR: refresh %s", lsa->str);
+
diff --git a/net/zebra/patches/patch-ce b/net/zebra/patches/patch-ce
new file mode 100644
index 00000000000..656df89df7c
--- /dev/null
+++ b/net/zebra/patches/patch-ce
@@ -0,0 +1,10 @@
+$NetBSD: patch-ce,v 1.1.2.2 2002/08/25 21:20:52 jlam Exp $
+
+diff -u1 ospf6d/ospf6_dbex.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_dbex.c
+--- ospf6d/ospf6_dbex.c Mon Jul 8 22:31:02 2002
++++ /home/itojun/work/zebra/zebra/ospf6d/ospf6_dbex.c Sat Aug 3 21:06:05 2002
+@@ -363,3 +363,3 @@
+ if (received->lsa_hdr->lsh_advrtr == ospf6->router_id
+- && have && ismore_recent < 0)
++ && (! have || ismore_recent < 0))
+ {
diff --git a/net/zebra/patches/patch-cf b/net/zebra/patches/patch-cf
new file mode 100644
index 00000000000..eeaf70554ba
--- /dev/null
+++ b/net/zebra/patches/patch-cf
@@ -0,0 +1,25 @@
+$NetBSD: patch-cf,v 1.1.2.2 2002/08/25 21:20:53 jlam Exp $
+
+diff -u1 ospf6d/ospf6_intra.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_intra.c
+--- ospf6d/ospf6_intra.c Mon Jul 8 22:31:02 2002
++++ /home/itojun/work/zebra/zebra/ospf6d/ospf6_intra.c Sat Jul 13 01:03:44 2002
+@@ -39,2 +39,12 @@
+
++ if (IS_OSPF6_DUMP_INTRA)
++ {
++ char buf[64];
++ struct prefix_ls *p_ls;
++ p_ls = (struct prefix_ls *) &topo_entry->route.prefix;
++ inet_ntop (AF_INET, &p_ls->adv_router, buf, sizeof (buf));
++ zlog_info ("INTRA: Calculate [%s] %s and %s",
++ (type == ADD ? "add" : "remove"), lsa->str, buf);
++ }
++
+ intra_prefix = OSPF6_LSA_HEADER_END (lsa->header);
+@@ -200,6 +210,2 @@
+ {
+- if (IS_OSPF6_DUMP_INTRA)
+- zlog_info ("INTRA: topology hook: Examining %s (%p)",
+- node.lsa->str, node.lsa);
+-
+ if (IS_LSA_MAXAGE (node.lsa))
diff --git a/net/zebra/patches/patch-cg b/net/zebra/patches/patch-cg
new file mode 100644
index 00000000000..8c4a1ab083c
--- /dev/null
+++ b/net/zebra/patches/patch-cg
@@ -0,0 +1,23 @@
+$NetBSD: patch-cg,v 1.1.2.2 2002/08/25 21:20:54 jlam Exp $
+
+diff -u1 ospf6d/ospf6_lsa.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_lsa.c
+--- ospf6d/ospf6_lsa.c Mon Jul 8 22:31:02 2002
++++ /home/itojun/work/zebra/zebra/ospf6d/ospf6_lsa.c Sat Aug 3 21:06:08 2002
+@@ -777,2 +777,3 @@
+ struct ospf6_lsdb *lsdb = NULL;
++ void (*hook) (struct ospf6_lsa *, struct ospf6_lsa *);
+
+@@ -806,8 +807,7 @@
+
+-#if 0
+- if (lsdb->hook)
+- (*lsdb->hook) (lsa, NULL);
+-#else /*0*/
+- CALL_REMOVE_HOOK (&database_hook, lsa);
+-#endif /*0*/
++ /* call LSDB hook to re-process LSA */
++ hook = ospf6_lsdb_hook[ntohs (lsa->header->type) &
++ OSPF6_LSTYPE_CODE_MASK].hook;
++ if (hook)
++ (*hook) (NULL, lsa);
+
diff --git a/net/zebra/patches/patch-ch b/net/zebra/patches/patch-ch
new file mode 100644
index 00000000000..cb30bd04d60
--- /dev/null
+++ b/net/zebra/patches/patch-ch
@@ -0,0 +1,37 @@
+$NetBSD: patch-ch,v 1.1.2.2 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);
+
diff --git a/net/zebra/patches/patch-ci b/net/zebra/patches/patch-ci
new file mode 100644
index 00000000000..075614c8323
--- /dev/null
+++ b/net/zebra/patches/patch-ci
@@ -0,0 +1,33 @@
+$NetBSD: patch-ci,v 1.1.2.2 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);
++ }
+
diff --git a/net/zebra/patches/patch-cj b/net/zebra/patches/patch-cj
new file mode 100644
index 00000000000..74a9b6504e9
--- /dev/null
+++ b/net/zebra/patches/patch-cj
@@ -0,0 +1,10 @@
+$NetBSD: patch-cj,v 1.1.2.2 2002/08/25 21:20:59 jlam Exp $
+
+diff -u1 ospf6d/ospf6d.h /home/itojun/work/zebra/zebra/ospf6d/ospf6d.h
+--- ospf6d/ospf6d.h Mon Jul 8 22:31:04 2002
++++ /home/itojun/work/zebra/zebra/ospf6d/ospf6d.h Sat Aug 3 21:06:15 2002
+@@ -76,3 +76,3 @@
+
+-#define OSPF6_DAEMON_VERSION "0.9.6i"
++#define OSPF6_DAEMON_VERSION "0.9.6k"
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-10 11:52:34 +0000