[vyatta-svn] xorp: Changes to 'master'

[Tom Grennan]

 bgp/bgp.cc           |   43 +++++++++++++++++++++++++++++++++++++++----
 bgp/bgp.hh           |   10 ++++++++++
 etc/templates/bgp.tp |   38 +++++++++++++++++++++-----------------
 3 files changed, 70 insertions(+), 21 deletions(-)

New commits:
commit 7e951caca8d917d4f0f52195d07399644acc34fd
Author: atanu <atanu>
Date:   Wed Mar 28 02:14:23 2007 +0000

    Do not form any peerings before the first policy push has been seen,
    this should fix the startup race where peerings are formed before
    policy has been applied.
    
    The regression tests continue to work as peerings are configured using
    enable not set_state and activate. The trick is to defer the
    activation of the peers until the first policy push is seen.
    
    Bugzilla URL:	http://www.xorp.org/bugzilla/show_bug.cgi?id=698
    (cherry picked from commit cccf1cb924738d20d1e4e6033813913763c6fc67)

commit 8cb2c75edc49eaa303dccd9b804224aa027bc9dc
Author: pavlin <pavlin>
Date:   Wed Mar 28 00:37:09 2007 +0000

    Changes related to fixing policy-related race condition when
    BGP might start and leak routes before the policy configuration
    has been received.
    
    The high level idea is that the policy manager will always
    send push_routes XRL to BGP even if there is no policy
    configuration.
    Then, on the BGP side the BGP processing will start only after it
    has received push_routes XRL from the policy manager.
    
    This change here is the part that makes sure that the policy manager
    will always send a push_routes XRL to BGP even if there is
    no policy configuration.
    
    Note that BGP depends on the policy manager (as defined in the rtrmgr
    template files), hence the policy manager will always be running
    before BGP has started.
    
    The details of the changes are:
    * Move all the BGP-related add_varmap policy XRLs inside the
      bgp template block.
      Thus, the policy manager will be properly configured even
      if the "policy {}" configuration block is empty.
    
    * Always send an export or an import BGP policy statement to the
      policy manager even if the policy statement is empty.
    
    This change is needed for Bugzilla entry #698
    
    Bugzilla URL:	http://www.xorp.org/bugzilla/show_bug.cgi?id=698
    Approved by:	Atanu Ghosh
    (cherry picked from commit f776e9cd23bd32a6f19367b032ba3430b10a7bbb)

http://suva.vyatta.com/git/?p=xorp.git;a=commitdiff;h=7e951caca8d917d4f0f52195d07399644acc34fd
http://suva.vyatta.com/git/?p=xorp.git;a=commitdiff;h=8cb2c75edc49eaa303dccd9b804224aa027bc9dc