summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Jakma <paul.jakma@sun.com>2007-04-10 19:20:29 +0000
committerPaul Jakma <paul.jakma@sun.com>2007-04-10 19:20:29 +0000
commit37a217a59bfd32381034a0ce0adbac1c34cbec37 (patch)
tree2f3d7a298c0b625163cd63bfa9bf32e1aa72012f
parent85ef784e8a41a6dd11da42e10368f80c8bdb99d8 (diff)
[bgpd] bug #352: IPv6/Multicast address-family config not written out
2007-04-07 Paul Jakma <paul.jakma@sun.com> * bgpd.c: (general) Fix bug #352 (bgp_config_write_family_header) write ipv6/multicast address family header. (bgp_config_write) write out ipv6 multicast AF config.
-rw-r--r--bgpd/ChangeLog7
-rw-r--r--bgpd/bgpd.c10
2 files changed, 16 insertions, 1 deletions
diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 7e964c95..fac0df90 100644
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-07 Paul Jakma <paul.jakma@sun.com>
+
+ * bgpd.c: (general) Fix bug #352
+ (bgp_config_write_family_header) write ipv6/multicast
+ address family header.
+ (bgp_config_write) write out ipv6 multicast AF config.
+
2007-02-22 Paul Jakma <paul.jakma@sun.com>
* bgp_fsm.c: (bgp_fsm_change_status) Handle state change into
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 3f841078..9852d659 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -4699,7 +4699,12 @@ bgp_config_write_family_header (struct vty *vty, afi_t afi, safi_t safi,
vty_out (vty, "vpnv4 unicast");
}
else if (afi == AFI_IP6)
- vty_out (vty, "ipv6");
+ {
+ vty_out (vty, "ipv6");
+
+ if (safi == SAFI_MULTICAST)
+ vty_out (vty, " multicast");
+ }
vty_out (vty, "%s", VTY_NEWLINE);
@@ -4928,6 +4933,9 @@ bgp_config_write (struct vty *vty)
/* IPv6 unicast configuration. */
write += bgp_config_write_family (vty, bgp, AFI_IP6, SAFI_UNICAST);
+ /* IPv6 multicast configuration. */
+ write += bgp_config_write_family (vty, bgp, AFI_IP6, SAFI_MULTICAST);
+
write++;
}
return write;