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

[Mark Handley]

CVSROOT:	/usr/local/share/doc/apache/cvs
Module name:	xorp
Changes by:	mjh@xorpc.icir.org	2005-07-09 19:47:41 UTC

XORP CVS repository


Modified files:
	rtrmgr        template_commands.cc template_commands.hh 

Log message:
	Fix buggy template xrl cleaning code.  As far as I can tell, the
	variable expansion code works fine, and doesn't need change.
	
	Now the following works (hacking an existing XRL for test purposes):
	
	%set: xrl "$(interfaces.targetname)/ifmgr/0.1/set_mtu?tid:u32=$(interfaces.TID)&ifname:txt=blah $(#) $(<>) $(@) foo&mtu:u32=$(@)";
	
	Note the three-variable expansion in ifname. This expands the way you'd expect:
	
	[ 19518   +62 unexpanded_xrl.cc ] XRL expanded to fea/ifmgr/0.1/set_mtu?tid:u32=0&ifname:txt=blah 10200000000 : 3 foo&mtu:u32=3
	
	Now be careful you don't go and put any & into your variables, or I've
	no idea what will happen.
	
	I've only tested this in no-execute mode, so it's possible there will
	be some issue trapped by the XRL library, but I don't see why that
	would be.

Revision  Changes                                Path
1.54      +35 -12;  commitid: a82d42d0280c7ea6;  xorp/rtrmgr/template_commands.cc
1.27      +3 -1;  commitid: a82d42d0280c7ea6;    xorp/rtrmgr/template_commands.hh