[Xorp-cvs] XORP cvs commit: xorp/rtrmgr
Mark Handley
mjh@icir.org
Sun, 3 Jul 2005 21:06:01 GMT
CVSROOT: /usr/local/share/doc/apache/cvs
Module name: xorp
Changes by: mjh@xorpc.icir.org 2005-07-03 21:06:01 UTC
XORP CVS repository
Modified files:
rtrmgr cli.cc conf_tree.cc conf_tree.hh conf_tree_node.cc
conf_tree_node.hh master_conf_tree.cc
master_conf_tree.hh master_conf_tree_node.cc
master_conf_tree_node.hh slave_conf_tree.cc
slave_conf_tree.hh slave_conf_tree_node.cc
slave_conf_tree_node.hh template_tree.cc
template_tree.hh xrl_rtrmgr_interface.cc
Log message:
Add most of the framework for node numbering. Rtrmgr and xorpsh can
now exchange node numbers as part of the configuration.
HEADS UP: config files exchanged back and forth between xorpsh and
rtrmgr now include node numbers. Anything talking to the rtrmgr to
extract the config needs to expect to see the nodes numbered. Eg:
%10% interfaces {
%20% interface xl0 {
%30% disable: false
}
}
The node numbers aren't visible to the user, either through xorpsh or
through saved configs. If you want to see them in xorpsh though,
change the false to a true at line 2634 of cli.cc (show_subtree).
Autonumbering of nodes isn't yet done properly, and you can't yet get
at the node number from the template file, but at least node numbers
are parsed, stored, and passed around correctly.
Revision Changes Path
1.68 +10 -5; commitid: 117c742c851807ea6; xorp/rtrmgr/cli.cc
1.33 +27 -21; commitid: 117c742c851807ea6; xorp/rtrmgr/conf_tree.cc
1.22 +25 -10; commitid: 117c742c851807ea6; xorp/rtrmgr/conf_tree.hh
1.70 +45 -10; commitid: 117c742c851807ea6; xorp/rtrmgr/conf_tree_node.cc
1.36 +7 -2; commitid: 117c742c851807ea6; xorp/rtrmgr/conf_tree_node.hh
1.49 +11 -10; commitid: 117c742c851807ea6; xorp/rtrmgr/master_conf_tree.cc
1.28 +2 -1; commitid: 117c742c851807ea6; xorp/rtrmgr/master_conf_tree.hh
1.12 +10 -8; commitid: 117c742c851807ea6; xorp/rtrmgr/master_conf_tree_node.cc
1.11 +6 -3; commitid: 117c742c851807ea6; xorp/rtrmgr/master_conf_tree_node.hh
1.28 +8 -7; commitid: 117c742c851807ea6; xorp/rtrmgr/slave_conf_tree.cc
1.18 +2 -1; commitid: 117c742c851807ea6; xorp/rtrmgr/slave_conf_tree.hh
1.20 +5 -3; commitid: 117c742c851807ea6; xorp/rtrmgr/slave_conf_tree_node.cc
1.11 +5 -2; commitid: 117c742c851807ea6; xorp/rtrmgr/slave_conf_tree_node.hh
1.32 +6 -5; commitid: 117c742c851807ea6; xorp/rtrmgr/template_tree.cc
1.19 +4 -2; commitid: 117c742c851807ea6; xorp/rtrmgr/template_tree.hh
1.36 +3 -3; commitid: 117c742c851807ea6; xorp/rtrmgr/xrl_rtrmgr_interface.cc