[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.

diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 7e964c9560931d5cb3dbbd8bf422f4b9023cda9d..fac0df90e4819b816ae5c88a8896ca79e5e02455 100644 (file)
--- 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 3f8410782e738158526ead6308ad17f67d25e149..9852d6595697e95a7ff807e57eaa4fbe40af15ca 100644 (file)
--- 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;