[vyatta-svn] xorp: Changes to 'xorp_1_4pre'
Tom Grennan
tgrennan at suva.vyatta.com
Fri Jan 12 17:56:08 PST 2007
New branch 'xorp_1_4pre' available with the following commits:
commit 255f3ccb263cbd0f800322440a2ce06903c9a765
Author: Tom Grennan <tgrennan at vyatta.com>
Date: Fri Jan 12 17:50:49 2007 -0800
Merge remote branch 'origin/icsi-cvsimport' into 1_4pre
commit 76d5b355fcf191dcfcaab15e9b8c9602bb850fa3
Author: pavlin <pavlin>
Date: Fri Jan 12 22:20:10 2007 +0000
Refactor the mechanism for processing the input data.
The refactoring eliminates a number of issues that were exposed when
configuring large number of static routes using a shell script.
This fixes Bugzilla entry #419.
Bugzilla URL: http://www.xorp.org/bugzilla/show_bug.cgi?id=419
(cherry picked from commit afb132c3039cb52daad1bfbaf94aebee843973f5)
Conflicts:
cli/cli_client.hh
commit fece8c8346d9e5f232ce385590c112e728103821
Author: pavlin <pavlin>
Date: Thu Jan 11 22:32:05 2007 +0000
Fix the documentation about the OSPF ebit. The correct behavior should be:
if the ebit it is true, then it is type2 OSPF route; if false, then it is
type1.
Bug found by: "Frank E. Renwick" <frenwick AT cengen.com>
Approved by: Atanu Ghosh
(cherry picked from commit 463d3ff95861385f17fc98091ac894047fb91774)
commit 52eb83cea127bfc22e6d97efa2f862e872ef57cd
Author: bms <bms>
Date: Wed Jan 10 20:22:58 2007 +0000
Fix an ioctl size mismatch between 64-bit and 32-bit versions of FreeBSD.
(cherry picked from commit a7a2e5337282146c4a2b79ed67700a087f5865ab)
commit 8b7e22bb2db76e9b71e8b5d176a0d835db4cf8c1
Author: Tom Grennan <tgrennan at vyatta.com>
Date: Tue Jan 2 12:33:38 2007 -0800
Applied these template resolutions suggested by Pavlin.
Note that the suggested mld.tp changed were previously made in commit:
d852d3fd11b1bca52edad374ea19d662fcdcea4d
To: Pavlin Radoslavov <pavlin at icir.org>
cc: John Gong <johngong at vyatta.com>, Justin Fletcher <jfletcher at vyatta.com>,
atanu at ICSI.Berkeley.EDU, tgrennan at vyatta.com,
"'Robert Bays'" <robert at vyatta.com>, mbush at ICSI.Berkeley.EDU
Subject: Re: Vyatta CD image and UNH IGMP and PIM testing schedule
Date: Fri, 29 Dec 2006 19:17:07 -0800
From: Pavlin Radoslavov <pavlin at icir.org>
Pavlin Radoslavov <pavlin at icir.org> wrote:
> > Thank you so much for working the extra days to prepare for the UNH tests
> > coming up. I hope you can answer one last decision we have to make before
> > submitting the image.
> >
> > As Tom Grennan began the merge with your latest changes, he noticed that there
> > were some template changes performed since the last tested image. Is this
> > something that would trip up the testers at UNH?
> >
> > We'll need to make a decision as to whether these changes would cause the UNH
> > team to be unable to perform the IGMP and PIM tests, or if you believe that
> > there shouldn't be a problem with the build that we're creating today, which
> > includes your changes through 12/25. Our alternative would be to deliver the
> > image which you last tested from 12/18.
>
> John,
>
> Those particular template changes are not critical for the tests.
> However, they are necessary in case the UNH folks manipulate their
> configuration on the fly using xorpsh. In particular, if they attempt
> to delete, say, IGMP or PIM-SM interface configuration.
> Without the changes, deleting an interface is a no-op, and the user
> won't notice that.
>
> If you decide not to integrate the template changes, the work-around
> for the UNH folks to use a command like the following to
> stop/disable an interface:
>
> set protocols igmp interface eth0 disable true
> commit
>
> If you don't integrate the template changes, then please add the
> above note to each of the lists with IGMP/PIM-SM test notes I sent
> you.
>
> Please let me know if you have any other questions.
John and Tom,
Following the private email exchange I had earlier this evening with
John regarding the rtrmgr template file modification, below I am
including the one-liners changes for the Vyatta's original template
files (i.e., before today's modifications) that are needed to take
care of the xorpsh configuration delete problem.
It seems that today's modifications change Vyatta's configuration
syntax (e.g., introduces the "vif" configuration nodes, renames
Vyatta's "multicast" top-level node to "plumbing", etc), which is
probably not what you want.
This modification is probably going to create confusion to the UNH
folks, and it also invalidates the examples in many of my test notes
that I sent you.
I would strongly recommend that you reverse today's modification
to the following files:
xorp/etc/templates/igmp.tp
xorp/etc/templates/mfea4.tp
xorp/etc/templates/mfea6.tp
xorp/etc/templates/mld.tp
Then apply the simple patches I am including below.
For reference purpose, I am including also the result (modified)
Vyatta template files.
The one-line modifications are simple enough so they don't need much
explanation, but just to be on the safe side please double-check the
final result (e.g., at least make sure that the rtrmgr starts with
the modified templates).
Pavlin
P.S. BTW, the original Vyatta's mld.tp was actually using "vif"
configuration nodes, but this is probably wrong so you might want to
fix it in the future. The MLD protocol won't be tested this time, so
the MLD vif shouldn't be an issue.
--- igmp.tp.org Mon Dec 18 18:14:40 2006
+++ igmp.tp Fri Dec 29 18:48:39 2006
@@ -66,6 +66,7 @@
%help: short "Configure IGMP on a virtual interface";
%activate: xrl "$(igmp.targetname)/mld6igmp/0.1/start_vif?vif_name:txt=$(interface.@)";
%update: xrl "$(igmp.targetname)/mld6igmp/0.1/start_vif?vif_name:txt=$(interface.@)";
+ %delete: xrl "$(igmp.targetname)/mld6igmp/0.1/stop_vif?vif_name:txt=$(interface.@)";
disable {
%help: short "Disable IGMP on an interface";
--- mfea4.tp.org Mon Dec 18 18:14:40 2006
+++ mfea4.tp Fri Dec 29 18:52:14 2006
@@ -59,6 +59,7 @@
%help: short "Configure IPv4 multicast forwarding on a network interface";
%activate: xrl "$(mfea4.targetname)/mfea/0.1/start_vif?vif_name:txt=$(interface.@)";
%update: xrl "$(mfea4.targetname)/mfea/0.1/start_vif?vif_name:txt=$(interface.@)";
+ %delete: xrl "$(mfea4.targetname)/mfea/0.1/stop_vif?vif_name:txt=$(interface.@)";
disable {
%help: short "Configure IPv4 multicast forwarding on an network interface";
--- mfea6.tp.org Mon Dec 18 18:14:40 2006
+++ mfea6.tp Fri Dec 29 18:53:13 2006
@@ -55,6 +55,7 @@
%help: short "Configure IPv6 MFEA on a network interface";
%activate: xrl "$(mfea6.targetname)/mfea/0.1/start_vif?vif_name:txt=$(interface.@)";
%update: xrl "$(mfea6.targetname)/mfea/0.1/start_vif?vif_name:txt=$(interface.@)";
+ %delete: xrl "$(mfea6.targetname)/mfea/0.1/stop_vif?vif_name:txt=$(interface.@)";
disable {
%help: short "Disable IPv6 MFEA on an interface";
--- mld.tp.org Mon Dec 18 18:14:40 2006
+++ mld.tp Fri Dec 29 18:50:28 2006
@@ -65,10 +65,12 @@
interface @ {
%help: short "Configure MLD on a network interface";
+ %delete: xrl "$(mld.targetname)/mld6igmp/0.1/stop_vif?vif_name:txt=$(interface.@)";
vif @ {
%help: short "Configure MLD on a virtual interface";
%activate: xrl "$(mld.targetname)/mld6igmp/0.1/start_vif?vif_name:txt=$(vif.@)";
%update: xrl "$(mld.targetname)/mld6igmp/0.1/start_vif?vif_name:txt=$(vif.@)";
+ %delete: xrl "$(mld.targetname)/mld6igmp/0.1/stop_vif?vif_name:txt=$(vif.@)";
disable {
%help: short "Disable MLD on an interface";
commit 44f72957c37db923ee38ecaf9426824977281a56
Author: Tom Grennan <tgrennan at vyatta.com>
Date: Tue Jan 2 12:01:32 2007 -0800
Revert "Post merge conflict resolution of multicast templates"
This reverts commit 6fe2d5eea9291c883067820902a3564ab38b236f.
commit 6fe2d5eea9291c883067820902a3564ab38b236f
Author: Tom Grennan <tgrennan at vyatta.com>
Date: Fri Dec 29 14:46:13 2006 -0800
Post merge conflict resolution of multicast templates
commit 43583afb129ab69ccfd091d80a43a7103ee00994
Merge: 9aee0727c9ff9a291eeb6e7c15e3c6af7c096e50 7f4631929572be050c3c1c08941dc67a94d075c3
Author: Tom Grennan <tgrennan at vyatta.com>
Date: Fri Dec 29 13:04:54 2006 -0800
Merge branch 'icsi-cvsimport' into 1_4pre
Conflicts:
etc/templates/igmp.tp
etc/templates/mfea4.tp
etc/templates/mfea6.tp
commit 9aee0727c9ff9a291eeb6e7c15e3c6af7c096e50
Author: Tom Grennan <tgrennan at vyatta.com>
Date: Fri Dec 22 17:01:43 2006 -0800
implement:
root at jubuntu-dut1> show bgp peer?
Possible completions:
peer Show BGP information for given peer
peers Show BGP information for all peers
commit 25f3d5d642d0b351f9c3a022c89198eeed5333d5
Author: Tom Grennan <tgrennan at vyatta.com>
Date: Fri Dec 22 16:55:57 2006 -0800
fix crash during
xorpsh_print_peers show bgp peers
vs.
xorpsh_print_peers show bgp peers detail
commit 675ce88b3273cac4c2aab19f52d4cf9e185f169e
Author: Tom Grennan <tgrennan at vyatta.com>
Date: Tue Dec 19 14:01:55 2006 -0800
set test program dependencies to enable "make -C xorp tags"
commit 6f34b3c72f3629baa7c5fa6d3db020056c8d8ed4
Merge: 63bb79a538053547c65e043d952045290fa0d4c0 dbfb47420fb9d38ba1dfe80b6c243a7b3f496b63
Author: Tom Grennan <tgrennan at vyatta.com>
Date: Mon Dec 18 16:48:13 2006 -0800
Merge branch 'icsi-cvsimport' into 1.4pre
commit 63bb79a538053547c65e043d952045290fa0d4c0
Merge: 06d0050b0b6b221bcf2a8d16cb2ed9ce7eeb255a e53873c7ddc7735e90305ae7e82535a3c5392eeb
Author: Tom Grennan <tgrennan at vyatta.com>
Date: Mon Dec 11 15:14:04 2006 -0800
Merge branch 'origin' into 1.4pre
commit 06d0050b0b6b221bcf2a8d16cb2ed9ce7eeb255a
Merge: d2d7c30682dffbdbb369bc2f8c6eca8f7cffb688 41ac7d335ef134391d00122499449f8f70a4ff66
Author: Tom Grennan <tgrennan at vyatta.com>
Date: Mon Dec 11 11:18:18 2006 -0800
Merge branch 'icsi-cvsimport' into 1.4pre
commit d2d7c30682dffbdbb369bc2f8c6eca8f7cffb688
Merge: d852d3fd11b1bca52edad374ea19d662fcdcea4d d86ba2833df5c58c332d882f902b89842b7bec08
Author: Tom Grennan <tgrennan at vyatta.com>
Date: Fri Dec 8 16:51:16 2006 -0800
Merge branch 'icsi-cvsimport' into pre1_4
Conflicts:
Makefile.in
MakefileRootCheck.in
bgp/Makefile.in
bgp/harness/Makefile.in
bgp/next_hop_resolver.cc
bgp/profile_vars.cc
bgp/route_table_policy.cc
bgp/route_table_policy_ex.cc
bgp/tools/Makefile.in
bgp/update_attrib.cc
cli/Makefile.in
cli/libtecla/configure
cli/tools/Makefile.in
config.h.in
configure
configure.in
contrib/Makefile.in
docs/Makefile.in
docs/bgp/Makefile.in
docs/design_arch/Makefile.in
docs/fea/Makefile.in
docs/libxipc/Makefile.in
docs/libxorp/Makefile.in
docs/mfea/Makefile.in
docs/mld6igmp/Makefile.in
docs/multicast/Makefile.in
docs/pim/Makefile.in
docs/pim_testsuite/Makefile.in
docs/rib/Makefile.in
docs/rtrmgr/Makefile.in
docs/slides/Makefile.in
docs/slides/status_2004_02/Makefile.in
docs/snmp/Makefile.in
docs/test_harness/Makefile.in
docs/user_manual/Makefile.in
docs/xorpdev_101/Makefile.in
etc/Makefile.in
etc/templates/Makefile.in
etc/templates/interfaces.tp
etc/templates/ospfv2.tp
etc/templates/policy.tp
fea/Makefile.in
fea/MakefileRootCheck.in
fea/ifconfig_set_netlink.cc
fea/tools/Makefile.in
fea/xrl_target.hh
fib2mrib/Makefile.in
libcomm/Makefile.in
libfeaclient/Makefile.in
libproto/Makefile.in
libxipc/Makefile.in
libxorp/Makefile.in
libxorp/debug.h
libxorp/run_command.cc
libxorp/xlog.c
libxorp/xlog.h
mibs/configure
mld6igmp/Makefile.in
mrt/Makefile.in
mrt/include/ip_mroute.h
mrt/max_vifs.h
ospf/Makefile.in
ospf/lsa.cc
ospf/tools/Makefile.in
pim/Makefile.in
policy/Makefile.in
policy/backend/Makefile.in
policy/common/Makefile.in
policy/common/register_operations.cc
policy/test/Makefile.in
rib/Makefile.in
rib/rib.cc
rib/tools/Makefile.in
rip/Makefile.in
rip/route_db.cc
rip/tools/Makefile.in
rtrmgr/Makefile.in
rtrmgr/cli.cc
rtrmgr/lex.boot.cc
rtrmgr/lex.opcmd.cc
rtrmgr/lex.tplt.cc
rtrmgr/master_conf_tree.cc
static_routes/Makefile.in
utils/Makefile.in
utils/flower_malloc/Makefile.in
xrl/Makefile.in
xrl/interfaces/Makefile.am
xrl/interfaces/Makefile.in
xrl/interfaces/fea_ifmgr_xif.cc
xrl/interfaces/fea_ifmgr_xif.hh
xrl/interfaces/fti_xif.cc
xrl/interfaces/fti_xif.hh
xrl/interfaces/ospfv2_xif.cc
xrl/interfaces/ospfv2_xif.hh
xrl/interfaces/ospfv3_xif.cc
xrl/interfaces/ospfv3_xif.hh
xrl/interfaces/policy_xif.cc
xrl/interfaces/policy_xif.hh
xrl/targets/Makefile.in
xrl/targets/fea.xrls
xrl/targets/fea_base.cc
xrl/targets/fea_base.hh
xrl/targets/ospfv2.xrls
xrl/targets/ospfv2_base.cc
xrl/targets/ospfv2_base.hh
xrl/targets/ospfv3.xrls
xrl/targets/ospfv3_base.cc
xrl/targets/ospfv3_base.hh
xrl/targets/policy.xrls
xrl/targets/policy_base.cc
xrl/targets/policy_base.hh
xrl/tests/Makefile.in
commit d852d3fd11b1bca52edad374ea19d662fcdcea4d
Author: Tom Grennan <tgrennan at vyatta.com>
Date: Thu Dec 7 12:12:15 2006 -0800
strip CVS keyword substitution of $XORP$ in preparation for merge of icsi-cvsimport
More information about the svn
mailing list