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

Tom Grennan tgrennan at suva.vyatta.com
Wed Feb 7 10:11:40 PST 2007 

 etc/templates/package.cmds               |   70 ---
 etc/templates/rl_interfaces.tp           |  148 -------
 etc/templates/rl_interfaces_tunnel.tp    |  204 ----------
 etc/templates/rl_misc.cmds               |  511 ---------------------------
 etc/templates/rl_vpn.cmds                |   31 -
 etc/templates/rl_vpn.tp                  |  358 -------------------
 rl_scripts/Vyatta.pm                     |  241 ------------
 rl_scripts/moduser                       |  144 -------
 rl_scripts/vpn-commit                    |   96 -----
 rl_scripts/vpn-config.pl                 |  536 ----------------------------
 rl_scripts/vpn-tunnel-config.pl          |  149 --------
 configure.in                             |  163 +++++---
 etc/templates/package.cmds.in            |   70 +++
 etc/templates/rl_interfaces.tp.in        |  149 ++++++++
 etc/templates/rl_interfaces_tunnel.tp.in |  204 ++++++++++
 etc/templates/rl_misc.cmds.in            |  508 +++++++++++++++++++++++++++
 etc/templates/rl_vpn.cmds.in             |   39 ++
 etc/templates/rl_vpn.tp.in               |  352 ++++++++++++++++++
 libxipc/rl_elapsed_counter.cc            |   16 
 libxipc/routelogics.cc                   |   11 
 libxorp/clock.cc                         |    8 
 rl_cmd_proc/command_proc_show_vpn.cc     |  547 +++++++++++++++--------------
 rl_cmd_proc/command_proc_show_vpn.hh     |   70 ++-
 rl_cmd_proc/xsl/show_vpn_ike_sa.xsl      |   51 +-
 rl_cmd_proc/xsl/show_vpn_ipsec_sa.xsl    |   18 
 rl_scripts/Vyatta.pm.in                  |  244 +++++++++++++
 rl_scripts/include.am                    |    3 
 rl_scripts/lighttpd.conf.in              |    6 
 rl_scripts/lighttpd.init.in              |    4 
 rl_scripts/moduser.in                    |  146 +++++++
 rl_scripts/rtrmgr.init.in                |    4 
 rl_scripts/show_interfaces               |  338 ++++++++++++++++++
 rl_scripts/telnetd.init.in               |    8 
 rl_scripts/vpn-commit.in                 |  104 +++++
 rl_scripts/vpn-config.pl.in              |  575 +++++++++++++++++++++++++++++++
 rl_scripts/vpn-tunnel-config.pl.in       |  149 ++++++++
 rl_scripts/vrrpd.init.in                 |    2 
 rl_system/rl_cmds.cc                     |    2 
 rl_vpn/xrl_rl_vpn_node.cc                |   12 
 rl_xg/xgdaemon/xgdaemon_xorp_link.cc     |    6 
 rl_xg/xgdaemon/xgdaemon_xorp_link.hh     |    2 
 rtrmgr/cli.cc                            |   23 +
 rtrmgr/master_conf_tree.cc               |    8 
 43 files changed, 3408 insertions(+), 2922 deletions(-)

New commits:
commit 090ddb4e45f76696e7d69bf42fd94697f77d0ade
Merge: 4fcd37e884f96c2f6ac9a7ee8e270e8d951120ce eb0ca672ec71e45e32e3f7bff915ae41b8a2787c
Author: Tom Grennan <tgrennan at vyatta.com>
Date:   Wed Feb 7 10:06:52 2007 -0800

    Merge remote branch 'origin/master' into xorp_1_4pre

commit eb0ca672ec71e45e32e3f7bff915ae41b8a2787c
Author: Tom Grennan <tgrennan at vyatta.com>
Date:   Wed Feb 7 09:41:39 2007 -0800

    fix for bug 1720

commit 3483ddab2b5a4479b5293d69eed7580cc9139688
Author: Tom Grennan <tgrennan at vyatta.com>
Date:   Wed Feb 7 09:27:28 2007 -0800

    squeeze blank lines in output

commit 298fe75a9d1a4bf39c389d6eb1e76fba4d5c2e4d
Author: Tom Grennan <tgrennan at vyatta.com>
Date:   Wed Feb 7 09:25:26 2007 -0800

    append blank line after each interface output

commit 9eacc06900deb37f9d611d0d8efd34b654816688
Author: Tom Grennan <tgrennan at vyatta.com>
Date:   Wed Feb 7 09:20:01 2007 -0800

    fix for bug 1719

commit dc30b0dccfd07bd3cca0906bf7053d7c0568c480
Merge: c66316070fa32fd420eb020013534c135aa2523d bf20369ef583a615f09fa6f6d0b139f6e3cae91d
Author: Tom Grennan <tgrennan at vyatta.com>
Date:   Wed Feb 7 02:05:21 2007 +0000

    Merge branch 'master' of suva:/git/xorp

commit bf20369ef583a615f09fa6f6d0b139f6e3cae91d
Merge: 58ab0e5f72344e1c68558e53820ef67e81520cff cbf68657ffab43e87c49486d2b24f670eac34001
Author: Stig Thormodsrud <stig at vyatta.com>
Date:   Tue Feb 6 17:45:04 2007 -0800

    Merge branch 'master' of git://git.vyatta.com/xorp

commit 58ab0e5f72344e1c68558e53820ef67e81520cff
Author: Stig Thormodsrud <stig at vyatta.com>
Date:   Tue Feb 6 17:39:55 2007 -0800

    Allow vif's to be configured for VPN (bug 1716).

commit cbf68657ffab43e87c49486d2b24f670eac34001
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Tue Feb 6 17:26:50 2007 -0800

    back out previous change and reapply fix to rtrmgr after configuration default directory is checked.

commit 58cd216f078aa018a0d28b03eb95e85855389cab
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Tue Feb 6 16:52:47 2007 -0800

     fix for bug 1721. Added code to load_func and save_func so that path is now defined within the context of the xorpsh. This all used to work, and I believe that the pathing was set in the rtrmgr but was lost with some work that was checked in

commit 3e73df4085733c0d72ba5ad2eeb3eb45464e38b3
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Tue Feb 6 14:15:43 2007 -0800

    Fix for bug 1578.

commit f029329958861a1caabfe8188109696e247df51a
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Tue Feb 6 11:02:27 2007 -0800

    fix for bug 1705.

commit 609e7ca864ded0756a01ed9112e529e6a2260633
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Tue Feb 6 09:56:09 2007 -0800

    Additional fixes to processing of vpn show commands for lifetime and active state and setting default values when not provided.

commit 489a9ad9da0a992d181cc81dd3a7497d5f888c07
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Mon Feb 5 20:40:52 2007 -0800

    fix for bug 1698.

commit e7bca186217f8a3ffa1f97f2a15b6fb12f8e1a2b
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Mon Feb 5 20:29:55 2007 -0800

    bugfix for 1687.

commit ede197c89011fe691acdff9a4e83856c52bc7479
Merge: af0f716aab3612bb72277cd32b3be073a0852225 2eec5da6e20ba563221746d9afc763aba7d20764
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Mon Feb 5 20:19:50 2007 -0800

    Merge branch 'master' of git://git.vyatta.com/xorp

commit af0f716aab3612bb72277cd32b3be073a0852225
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Mon Feb 5 20:19:13 2007 -0800

    redefine remote/local nodes as right/left in line with openswan convention.

commit 2eec5da6e20ba563221746d9afc763aba7d20764
Author: Rick Balocca <rbalocca at phuket.vyatta.com>
Date:   Mon Feb 5 18:33:11 2007 -0800

    Only add wan0..wan99 to config.boot

commit 82a3b81cac267566832cabc922acc9f09261797d
Merge: bb406914c12c7a0c169d95aae704dd948e5f4dd0 aaa02f94ca1076a5dc7cdc887153a4ebf3477431
Author: Tom Grennan <tgrennan at vyatta.com>
Date:   Mon Feb 5 15:24:40 2007 -0800

    Merge branch 'master' of git://git.vyatta.com/xorp

commit aaa02f94ca1076a5dc7cdc887153a4ebf3477431
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Mon Feb 5 15:13:17 2007 -0800

    set initialization values for state, encrypt, nat, hash--additional work on this bug needs to be done to the xsl scripts.

commit bb406914c12c7a0c169d95aae704dd948e5f4dd0
Author: Tom Grennan <tgrennan at vyatta.com>
Date:   Mon Feb 5 14:54:52 2007 -0800

    a vif interface is eth#.# not eth#:#

commit c66316070fa32fd420eb020013534c135aa2523d
Author: Tom Grennan <tgrennan at vyatta.com>
Date:   Mon Feb 5 21:01:10 2007 +0000

    re-arranged eval, AC_DEFINE and AC_SUBST which found this bug
    
    AC_DEFINE(PKGDATADIR...
    vs.
    AC_DEFINE_UNQUOTED(PKGDATADIR...

commit a871d847dd680e2a7107575ba7e70953340c884e
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Fri Feb 2 19:58:29 2007 -0800

    Specified explicit path for lighttpd, removed -P argument, and disabled logging by default.  Bug 1709 fix.

commit a8830d242988ede5ce7a170245dc76e4815d814c
Author: Tom Grennan <tgrennan at vyatta.com>
Date:   Fri Feb 2 18:29:34 2007 -0800

    clarify usage with examples

commit 0d776d812bae15d87761a3688c090d1270d052ca
Merge: 17a4e29c39d39094b8a2a9256992245033931e69 4261904de8261f1207a07888665970cb04350114
Author: Tom Grennan <tgrennan at vyatta.com>
Date:   Fri Feb 2 17:28:38 2007 -0800

    Merge branch 'master' of git://git.vyatta.com/xorp

commit 17a4e29c39d39094b8a2a9256992245033931e69
Author: Tom Grennan <tgrennan at vyatta.com>
Date:   Fri Feb 2 17:28:13 2007 -0800

    Script "show interfaces"

commit 4261904de8261f1207a07888665970cb04350114
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Feb 2 15:42:50 2007 -0800

    Fix for bug 89--switched use to uptime clock (thanks for the pointer marat) that doesn't directly or indirectly rely on pthreads. Fixes problem associated with bug 89.

commit 28f0a1e47c54bcbf9d4c9b5bbb53ee058feb4a9d
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Feb 2 12:12:12 2007 -0800

    Fixes for remaining vpn operational command bugs--needs more testing against mulitple tunnels. Bugs fixes: 1705, 1688, 1696 (mitigates this problem)

commit 5f92091672f29e230059712707654ddc1b02a1d3
Author: Stig Thormodsrud <stig at vyatta.com>
Date:   Thu Feb 1 18:28:00 2007 -0800

    Limit number of proposals to 10 (1699).

commit adfadf230663be2de8d985a1aa0439e4e74e35c4
Author: Stig Thormodsrud <stig at vyatta.com>
Date:   Thu Feb 1 13:45:48 2007 -0800

    Remove sha2 from vpn cli (1668).

commit 4c248bdaa47700ce74148afaccba3182ec1da8d2
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Thu Feb 1 10:11:51 2007 -0800

    Enforce string matching with encryption and hash from openswan to xorp configured values.

commit e9b42761310a45e566e3b0b1c2112271e3b19bad
Merge: d532beb58b532472f5150eae9455a0dc511ce6ef 09e8e981135f8df1c533654c695c9c12b74ff448
Author: Robert Bays <rbays at phuket.vyatta.com>
Date:   Wed Jan 31 17:51:00 2007 -0800

    Merge branch 'master' of git://git.vyatta.com/xorp

commit d532beb58b532472f5150eae9455a0dc511ce6ef
Author: Robert Bays <rbays at phuket.vyatta.com>
Date:   Wed Jan 31 17:50:26 2007 -0800

    fix for bug 1695

commit 09e8e981135f8df1c533654c695c9c12b74ff448
Merge: a7baa35df3f69714290faedf37d36c45b3dbe8d6 159e953736f7385334ebc241aea0c4a6a7d62066
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Jan 31 17:21:40 2007 -0800

    Merge branch 'master' of git://git.vyatta.com/xorp

commit a7baa35df3f69714290faedf37d36c45b3dbe8d6
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Jan 31 17:21:11 2007 -0800

    Bug 1701: correctly write out %any in ipsec.secrets

commit 159e953736f7385334ebc241aea0c4a6a7d62066
Author: Stig Thormodsrud <stig at vyatta.com>
Date:   Wed Jan 31 17:13:41 2007 -0800

    Fix for 1676 "Unable to commit configuration due to "Permission denied" filesystem error".

commit 9ebf8a4a01c68a23136e3eab600d2e160272485f
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Wed Jan 31 16:40:07 2007 -0800

    Modified rl_cmd_proc/xsl/show_vpn_ike_sa.xsl to use <ike_encrypt> and <ike_hash>, and rl_cmd_proc/xsl/show_vpn_ipsec_sa.xsl to use <esp_encrypt> and <esp_hash>.  Bug 1687 fix.

commit f1a61eef9a2c1863a85bfad62551b20356c47713
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Wed Jan 31 16:08:12 2007 -0800

    partial fix for bug 1687--now retrieving encrypt and hash for both ike and esp.

commit 40196758e06f53bef1255d96231b074f5ce1c57f
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Wed Jan 31 09:57:38 2007 -0800

    Additional fixes for the vpn show command. cleanup of output, and allow single tunnel to be represented in init state.

commit 10bbd99bf19a4a32fb18a1244b442ec9744558b7
Author: Stig Thormodsrud <stig at vyatta.com>
Date:   Tue Jan 30 21:59:42 2007 -0800

    Clean up redundant code in fix for 1683.

commit 23430c0b75c99a3be06d7d4a61e504eef6fc0654
Author: Stig Thormodsrud <stig at vyatta.com>
Date:   Tue Jan 30 18:36:31 2007 -0800

    Fix for 1683 "IP addresses not corresponding to existing interfaces".

commit e78875414e43fbe6c0a02a1cad9880132b860618
Merge: cf92d51b22efd2101af8082166e9250c191a7140 97b8b42a606902dd51949b2b7323661aed49d78d
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Tue Jan 30 18:31:05 2007 -0800

    Merge branch 'master' of ssh://suva/git/xorp

commit cf92d51b22efd2101af8082166e9250c191a7140
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Tue Jan 30 18:30:54 2007 -0800

    Using <active_time> tag rather than <active> tag to display active time.  Also trimming away the trailing '(s)' seconds unit abbreviation.  Bug 1686 fix.

commit 97b8b42a606902dd51949b2b7323661aed49d78d
Author: Stig Thormodsrud <stig at vyatta.com>
Date:   Tue Jan 30 18:15:03 2007 -0800

    Fix compile problem in command_proc_show_vpn.cc

commit fc25a905ba15267aec28725ee77726fa36d7166b
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Tue Jan 30 17:38:16 2007 -0800

    added lifetime to output, part of bug 1686 fix.

commit 6598e8b6540a346d09a6f5f5ae94ee560d247a52
Merge: 1d72e2efde2994451a744de5ebc3aff0814a47ca f777435d30032c0acbbd161fb939a7b47aa849a6
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Tue Jan 30 17:21:09 2007 -0800

    Merge branch 'master' of git://git.vyatta.com/xorp

commit 1d72e2efde2994451a744de5ebc3aff0814a47ca
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Tue Jan 30 17:20:32 2007 -0800

    state is now provided as part of the command

commit f777435d30032c0acbbd161fb939a7b47aa849a6
Merge: dda70b86c17652f4afeafb24a1bb92b19419a27c 2cd04819b64546c5458fcb02151c0737505e671f
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 30 17:15:35 2007 -0800

    Merge branch 'master' of git://git.vyatta.com/xorp

commit dda70b86c17652f4afeafb24a1bb92b19419a27c
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 30 17:15:02 2007 -0800

    Add VPN debug commands

commit 2cd04819b64546c5458fcb02151c0737505e671f
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Tue Jan 30 17:03:28 2007 -0800

    Reworked cmd proc to avoid stitching together output from setkey -D and setkey -DP. Only relies on -D output and config file--this will provide a more consistant processing--also now provides unconverted state. Fixes for bugs: 1685, 1698 (fingers crossed).

commit 9e85c0237d029b3824d4acbef71038a5630d3bf6
Author: Stig Thormodsrud <stig at vyatta.com>
Date:   Tue Jan 30 16:09:59 2007 -0800

    Fix for 1693 "PN and system logging levels are inconsistent"

commit 1c6cdb0e4cf506424e9a3cc3f37b233aa806710b
Author: Stig Thormodsrud <stig at vyatta.com>
Date:   Tue Jan 30 14:22:34 2007 -0800

    Fix VPN breakage.

commit 3afad43fd25afaaf4aa28898f3106a8456dbe4f3
Author: Stig Thormodsrud <stig at vyatta.com>
Date:   Tue Jan 30 12:00:06 2007 -0800

    Fix VPN breakage.

commit 0900ce08b8488cd6c54196705f559e64b2352596
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Mon Jan 29 20:05:04 2007 -0800

    fix for bug 1694.

commit b69f488bd2ee99f0f3a0cb9bae873b04613adb35
Author: Stig Thormodsrud <stig at vyatta.com>
Date:   Mon Jan 29 18:43:36 2007 -0800

    Add error checking for vpn logging facility/level. (bug 1675)

commit 821a906199f548098345a9d7bcebd7ea8c89e616
Merge: 6d88bdce7797b652fd4cf9f70b5e27660f014c29 ba791071061984277be0b771a32f7cf4e475c84d
Author: Tom Grennan <tgrennan at vyatta.com>
Date:   Mon Jan 29 16:35:34 2007 -0800

    Merge branch 'master' of git://git.vyatta.com/xorp

commit 6d88bdce7797b652fd4cf9f70b5e27660f014c29
Author: Tom Grennan <tgrennan at vyatta.com>
Date:   Mon Jan 29 16:35:04 2007 -0800

    configure all references to /opt/vyatta

commit ba791071061984277be0b771a32f7cf4e475c84d
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Mon Jan 29 13:32:10 2007 -0800

    Only displaying <setkey> nodes with <dir> node value 'in' for command 'show vpn ike sa'.  Part of bug 1685 fix.

commit fc149d3dfcabf58baa5ebb6bd6368af0ccffcf60
Author: Tom Grennan <tgrennan at vyatta.com>
Date:   Mon Jan 29 10:57:51 2007 -0800

    vrrpd.init.in should use @SBINDIR@ instead of /opt/vyatta/sbin

commit 8c4aa64c08cfca2f9144452fe0832247ba14241b
Author: Tom Grennan <tgrennan at vyatta.com>
Date:   Mon Jan 29 10:53:14 2007 -0800

    telnetd.init.in should use @SBINDIR@ instead of /opt/vyatta/sbin

commit 026f0d3a99ad0ced1dc0f7f6b4b3c2f4a9e024af
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Mon Jan 29 09:47:44 2007 -0800

    fix for bug 1672. Now verify configured interfaces against ipsec.conf before proceeding with processing.

http://suva.vyatta.com/git/?p=xorp.git;a=commitdiff;h=090ddb4e45f76696e7d69bf42fd94697f77d0ade

More information about the svn mailing list