Revision: 11658
          http://xorp.svn.sourceforge.net/xorp/?rev=11658&view=rev
Author:   bms_fbsd
Date:     2009-12-03 20:58:08 +0000 (Thu, 03 Dec 2009)

Log Message:
-----------
In r11530, a change was introduced to the PIM template files which
was commented out.

This change causes the Router Manager to use a new RPC method in the
XORP PIM target, apply_bsr_changes, to apply a change in the PIM
bootstrap router configuration, without blowing away the Elected-BSR
router state.

Activate this change unconditionally.

Modified Paths:
--------------
    trunk/xorp/etc/templates/pimsm4.tp
    trunk/xorp/etc/templates/pimsm6.tp

Modified: trunk/xorp/etc/templates/pimsm4.tp
===================================================================
--- trunk/xorp/etc/templates/pimsm4.tp  2009-12-03 20:41:25 UTC (rev 11657)
+++ trunk/xorp/etc/templates/pimsm4.tp  2009-12-03 20:58:08 UTC (rev 11658)
@@ -209,15 +209,7 @@
            %help:      short "Configure the IPv4 Bootstrap mechanism";
            %activate:  xrl "$(pimsm4.targetname)/pim/0.1/stop_bsr";
            %activate:  xrl "$(pimsm4.targetname)/pim/0.1/start_bsr";
-           /*
-            * To test runtime BSR reconfiguration, comment out the two
-            * lines below, and uncomment the apply_bsr_changes line.
-            */
-           %update:    xrl "$(pimsm4.targetname)/pim/0.1/stop_bsr";
-           %update:    xrl "$(pimsm4.targetname)/pim/0.1/start_bsr";
-           /*
            %update:    xrl "$(pimsm4.targetname)/pim/0.1/apply_bsr_changes";
-            */
            %delete:    xrl "$(pimsm4.targetname)/pim/0.1/stop_bsr";
 
            disable {

Modified: trunk/xorp/etc/templates/pimsm6.tp
===================================================================
--- trunk/xorp/etc/templates/pimsm6.tp  2009-12-03 20:41:25 UTC (rev 11657)
+++ trunk/xorp/etc/templates/pimsm6.tp  2009-12-03 20:58:08 UTC (rev 11658)
@@ -209,15 +209,7 @@
            %help:      short "Configure the IPv6 Bootstrap mechanism";
            %activate:  xrl "$(pimsm6.targetname)/pim/0.1/stop_bsr";
            %activate:  xrl "$(pimsm6.targetname)/pim/0.1/start_bsr";
-           /*
-            * To test runtime BSR reconfiguration, comment out the two
-            * lines below, and uncomment the apply_bsr_changes line.
-            */
-           %update:    xrl "$(pimsm6.targetname)/pim/0.1/stop_bsr";
-           %update:    xrl "$(pimsm6.targetname)/pim/0.1/start_bsr";
-           /*
            %update:    xrl "$(pimsm6.targetname)/pim/0.1/apply_bsr_changes";
-            */
            %delete:    xrl "$(pimsm6.targetname)/pim/0.1/stop_bsr";
 
            disable {


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

_______________________________________________
Xorp-cvs mailing list
[email protected]
http://mailman.ICSI.Berkeley.EDU/mailman/listinfo/xorp-cvs

Reply via email to