[Xorp-cvs] XORP cvs commit: xorp/rtrmgr

[Pavlin Radoslavov]

CVSROOT:	/usr/local/share/doc/apache/cvs
Module name:	xorp
Changes by:	pavlin@xorpc.icir.org	2005-10-11 17:59:43 UTC

XORP CVS repository


Modified files:
	rtrmgr        conf_tree.cc conf_tree.hh conf_tree_node.cc 
	              conf_tree_node.hh master_conf_tree.cc 
	              xorpsh_main.cc 

Log message:
	Add a new flag "preserve_node_id" to ConfigNodeId::merge_deltas()
	which can be used to specify whether the original node ID should
	be used when adding the new nodes or whether a new node ID should
	be generated.
	
	This fixes a bug with the generation of node IDs when loading
	a new configuration from a file. E.g., if the old configuration
	contains "interface eth0" and the new configuration contains
	"interface eth1": previously the node ID of "interface eth1" was
	same as the deleted "interface eth0", but now it contains an unique
	node ID.

Revision  Changes                                Path
1.46      +5 -3;  commitid: 6940434bfc877ea6;    xorp/rtrmgr/conf_tree.cc
1.27      +3 -2;  commitid: 6940434bfc877ea6;    xorp/rtrmgr/conf_tree.hh
1.90      +18 -5;  commitid: 6940434bfc877ea6;   xorp/rtrmgr/conf_tree_node.cc
1.51      +3 -2;  commitid: 6940434bfc877ea6;    xorp/rtrmgr/conf_tree_node.hh
1.62      +23 -12;  commitid: 6940434bfc877ea6;  xorp/rtrmgr/master_conf_tree.cc
1.54      +3 -2;  commitid: 6940434bfc877ea6;    xorp/rtrmgr/xorpsh_main.cc