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

Marat Nepomnyashy marat at suva.vyatta.com
Fri Feb 2 20:07:32 PST 2007


 etc/templates/package.cmds                            |   70 -
 etc/templates/rl_interfaces.tp                        |  148 ---
 etc/templates/rl_misc.cmds                            |  511 ----------
 rl_scripts/moduser                                    |  144 ---
 rl_scripts/vyatta-sysklogd                            |   98 --
 rl_xg/Makefile.am                                     |  268 -----
 rl_xg/xgcgi/cgi_util.cc                               |  254 -----
 rl_xg/xgcgi/cgi_util.hh                               |   95 -
 Makefile.am                                           |    2 
 configure.in                                          |   44 
 etc/include.am                                        |    3 
 etc/templates/Makefile.am                             |    2 
 etc/templates/package.cmds.in                         |   70 +
 etc/templates/rl_interfaces.tp.in                     |  148 +++
 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_mgr.cc                       |    5 
 rl_cmd_proc/command_proc_show_vpn.cc                  |  569 +++++++++++
 rl_cmd_proc/command_proc_show_vpn.hh                  |  140 ++
 rl_cmd_proc/include.am                                |    8 
 rl_cmd_proc/xsl/show_vpn_ike_sa.xsl                   |   81 +
 rl_cmd_proc/xsl/show_vpn_ike_status.xsl               |   48 +
 rl_cmd_proc/xsl/show_vpn_ipsec_sa.xsl                 |   81 +
 rl_cmd_proc/xsl/show_vpn_ipsec_sa_statistics.xsl      |   62 +
 rl_cmd_proc/xsl/show_vpn_ipsec_status.xsl             |   57 +
 rl_interfaces/rl_interfaces_node.cc                   |    8 
 rl_interfaces_tunnel/include.am                       |   15 
 rl_interfaces_tunnel/rl_interfaces_tunnel_module.h    |   23 
 rl_interfaces_tunnel/xorp_rl_interfaces_tunnel.cc     |  192 ++++
 rl_interfaces_tunnel/xrl_rl_interfaces_tunnel_node.cc |  198 ++++
 rl_interfaces_tunnel/xrl_rl_interfaces_tunnel_node.hh |  159 +++
 rl_protocols/rl_protocols_node.cc                     |    6 
 rl_scripts/Vyatta.pm.in                               |  242 +++++
 rl_scripts/dhcpd.init.in                              |   87 +
 rl_scripts/dhcrelay.init.in                           |  100 ++
 rl_scripts/include.am                                 |   23 
 rl_scripts/lighttpd.conf.in                           |  336 +++++++
 rl_scripts/lighttpd.init.in                           |   97 ++
 rl_scripts/moduser.in                                 |  146 +++
 rl_scripts/ntpd.init.in                               |   59 +
 rl_scripts/rtrmgr.init.in                             |    6 
 rl_scripts/show_interfaces                            |  339 +++++++
 rl_scripts/sysklogd.init.in                           |    4 
 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_scripts/webssl.conf                                |   16 
 rl_service/rl_service_node.cc                         |   36 
 rl_system/rl_cmds.cc                                  |   12 
 rl_system/rl_syslog_node.cc                           |    6 
 rl_system/rl_system_node.cc                           |   12 
 rl_vpn/include.am                                     |   15 
 rl_vpn/rl_vpn_module.h                                |   23 
 rl_vpn/xorp_rl_vpn.cc                                 |  192 ++++
 rl_vpn/xrl_rl_vpn_node.cc                             |  223 ++++
 rl_vpn/xrl_rl_vpn_node.hh                             |  165 +++
 rl_xg/basic/basic_error_info.cc                       |   56 +
 rl_xg/basic/basic_error_info.hh                       |   56 +
 rl_xg/basic/common_xml.cc                             |   31 
 rl_xg/basic/common_xml.hh                             |   45 
 rl_xg/basic/xgdaemon_socket.cc                        |  204 ++++
 rl_xg/basic/xgdaemon_socket.hh                        |   88 +
 rl_xg/basic/xgdaemon_util.cc                          |  860 ++++++++++++++++++
 rl_xg/basic/xgdaemon_util.hh                          |  117 ++
 rl_xg/basic/xml_info.cc                               |  836 +++++++++++++++++
 rl_xg/basic/xml_info.hh                               |  252 +++++
 rl_xg/basic_client/basic_xgdaemon_client.cc           |   65 +
 rl_xg/basic_client/basic_xgdaemon_client.hh           |   53 +
 rl_xg/cgi/cgi_util.cc                                 |  254 +++++
 rl_xg/cgi/cgi_util.hh                                 |   95 +
 rl_xg/common/basic_error_info.cc                      |   56 +
 rl_xg/common/basic_error_info.hh                      |   56 +
 rl_xg/common/context_info.cc                          |    2 
 rl_xg/common/error_info.cc                            |   27 
 rl_xg/common/error_info.hh                            |   16 
 rl_xg/common/opcmd_info.cc                            |    2 
 rl_xg/common/textparse/text_parse_util.cc             |    2 
 rl_xg/common/xgdaemon_common_xml.cc                   |    3 
 rl_xg/common/xgdaemon_common_xml.hh                   |   13 
 rl_xg/html/css/main.css                               |  168 +--
 rl_xg/html/images/container_bg3.gif                   |binary
 rl_xg/html/index.html                                 |   14 
 rl_xg/html/js/ui.js                                   |   63 -
 rl_xg/include.am                                      |  216 ++--
 rl_xg/xgcgi/test_client.cc                            |    2 
 rl_xg/xgcgi/xgcgi.cc                                  |    6 
 rl_xg/xgcgi/xgcgi.hh                                  |    2 
 rl_xg/xgcgi/xgdaemon_client.cc                        |   38 
 rl_xg/xgcgi/xgdaemon_client.hh                        |   21 
 rl_xg/xgcgi2/cgi_log.cc                               |    2 
 rl_xg/xgcgi2/xgcgi2.cc                                |   40 
 rl_xg/xgcgi2/xgcgi2.hh                                |   14 
 rl_xg/xgdaemon/server_session_info.cc                 |    4 
 rl_xg/xgdaemon/server_system_info.cc                  |    2 
 rl_xg/xgdaemon/xgdaemon.cc                            |    9 
 rl_xg/xgdaemon/xgdaemon_pam_util.cc                   |    2 
 rl_xg/xgdaemon/xgdaemon_proc_util.cc                  |    2 
 rl_xg/xgdaemon/xgdaemon_server.cc                     |    3 
 rl_xg/xgdaemon/xgdaemon_server.hh                     |    4 
 rl_xg/xgdaemon/xgdaemon_server_socket.hh              |    2 
 rl_xg/xgdaemon/xgdaemon_xorp_link.cc                  |   15 
 rl_xg/xgdaemon/xgdaemon_xorp_link.hh                  |    2 
 rl_xg/xgdaemon/xgdaemon_xorp_util.cc                  |    2 
 rl_xg/xgdaemon/xorp_dir_info.cc                       |    2 
 rl_xg/xgdaemon/xorp_mod_info.cc                       |    2 
 rl_xg/xgdaemon/xorp_opcmd_info.cc                     |    2 
 rtrmgr/cli.cc                                         |    4 
 rtrmgr/task.cc                                        |   19 
 rtrmgr/task.hh                                        |    1 
 xrl/interfaces/include.am                             |    2 
 xrl/interfaces/rl_interfaces_tunnel.xif               |   16 
 xrl/interfaces/rl_vpn.xif                             |   21 
 xrl/targets/include.am                                |   12 
 xrl/targets/rl_interfaces_tunnel.tgt                  |    5 
 xrl/targets/rl_vpn.tgt                                |    5 
 122 files changed, 9461 insertions(+), 2076 deletions(-)

New commits:
commit 0b5eb27264809f14bffdc2505db59f90732ca13a
Merge: 3512ed6a778ea1f59900c4dd8bb40a36b3d23bc9 a871d847dd680e2a7107575ba7e70953340c884e
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Fri Feb 2 20:02:28 2007 -0800

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

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.

commit af057a54047643d21b50e1508a44763c2b357215
Merge: 35cbf89bfe8b26f45890f95612a24bdb203bbef3 70d6218239e9556ead1fec56d8871b6d7b03ae4c
Author: Tom Grennan <tgrennan at vyatta.com>
Date:   Fri Jan 26 15:58:41 2007 -0800

    Merge branch 'alameda' of git://git.vyatta.com/xorp into alameda

commit 35cbf89bfe8b26f45890f95612a24bdb203bbef3
Author: Tom Grennan <tgrennan at vyatta.com>
Date:   Fri Jan 26 15:58:03 2007 -0800

    move and reference all rtrmgr controlled init scripts in /opt/vyatta/sbin
    rather than sysvinit /etc/init.d

commit 70d6218239e9556ead1fec56d8871b6d7b03ae4c
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Thu Jan 25 23:32:53 2007 -0800

    Modify config directory structure location

commit fe3fd28d5da11cc1377c70fee960225218fb40fc
Merge: 66c1ee9136201ff339f9abd1a8d30016b758510f 8f9baccf4f24b454e900a7f8e2a24d6a57231a02
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Thu Jan 25 17:44:49 2007 -0800

    Merge branch 'alameda' of git://git.vyatta.com/xorp into alameda

commit 66c1ee9136201ff339f9abd1a8d30016b758510f
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Thu Jan 25 17:44:06 2007 -0800

    Move /opt/vyatta/share/xorp/config to /opt/vyatta/config

commit b6ca6cc345f123206a8674c65340277aba379f3d
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Thu Jan 25 17:38:45 2007 -0800

    Comment out VPN tunnels for now

commit 8f9baccf4f24b454e900a7f8e2a24d6a57231a02
Merge: 95b2e3b5ec51503336eb8922debd1bc8116f2815 d74171ac8d7c3304c74af90aa083be8802382c60
Author: Tom Grennan <tgrennan at vyatta.com>
Date:   Thu Jan 25 15:34:49 2007 -0800

    Merge branch 'alameda' of git://git.vyatta.com/xorp into alameda

commit 95b2e3b5ec51503336eb8922debd1bc8116f2815
Author: Tom Grennan <tgrennan at vyatta.com>
Date:   Thu Jan 25 15:34:13 2007 -0800

    rearrange PATH

commit d74171ac8d7c3304c74af90aa083be8802382c60
Author: Stig Thormodsrud <stig at vyatta.com>
Date:   Thu Jan 25 13:51:30 2007 -0800

    Add help string for proposals (bug 1671).

commit 7300cd8888da469e3f2aa487f3a66274eff14f28
Merge: 90c98b9f1d709e9de06122378775a5918d456b74 5851338e29431d43281ae1a6983931d37298a60e
Author: Tom Grennan <tgrennan at vyatta.com>
Date:   Wed Jan 24 23:53:37 2007 +0000

    Merge branch 'alameda' of git://git.vyatta.com/xorp into alameda

commit 90c98b9f1d709e9de06122378775a5918d456b74
Author: Tom Grennan <tgrennan at vyatta.com>
Date:   Wed Jan 24 23:50:53 2007 +0000

    follow search PATH for iptables instead of hard coded /opt/vyatta

commit 5851338e29431d43281ae1a6983931d37298a60e
Merge: 30dbeec1765a5bf9fcacda01a8e223e2a02c8293 f2a059977b6a0cce03c852ccf5e634f6b3a2a9dd
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Wed Jan 24 11:24:41 2007 -0800

    Merge branch 'alameda' of git://git.vyatta.com/xorp into alameda

commit 30dbeec1765a5bf9fcacda01a8e223e2a02c8293
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Wed Jan 24 11:24:24 2007 -0800

    Fix for proviiding spi value as hex rather than decimal. Also fixed tunnel scanning to provide both in and out direction--but note that this will currently fail on configured secondary addresses. This will need a netlink rl_interface call.

commit f2a059977b6a0cce03c852ccf5e634f6b3a2a9dd
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Wed Jan 24 10:34:03 2007 -0800

    Use //opcommand/format/setup_status_tunnels instead of count(//opcommand/format/auto_status_interface) to display the number of active ipsec tunnels.  Bug 1666 fix.

commit 7b1e28e9a842ca368351c03ac80a4104ee1a67e2
Merge: ec2d1f6e1dbb7008861d490cb1860c944ea2475d fc2d6493f2c6428563cfc08d107916693617b56c
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 23 17:06:29 2007 -0800

    Merge branch 'alameda' of git://git.vyatta.com/xorp into alameda
    
    Conflicts:
    
    	etc/templates/rl_vpn.tp

commit ec2d1f6e1dbb7008861d490cb1860c944ea2475d
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 23 16:55:29 2007 -0800

    Use unionfs to track uncommited configuration changes

commit fc2d6493f2c6428563cfc08d107916693617b56c
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Tue Jan 23 16:33:09 2007 -0800

    Changed column margins to 1 for 'show vpn ipsec sa' command so that the output fits into 80 columns.

commit fdf62427d5cd912349da6497a98190aaa4490303
Merge: f831aab482645157a45f68ed71630a242df4024a 12c49adb63b3acf35073349f75119ac481a7fcdb
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Tue Jan 23 15:59:33 2007 -0800

    Merge branch 'alameda' of git://git.vyatta.com/xorp into alameda

commit f831aab482645157a45f68ed71630a242df4024a
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Tue Jan 23 15:41:10 2007 -0800

    fix for bug 1663--return message if vpn process is not active.

commit 12c49adb63b3acf35073349f75119ac481a7fcdb
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Tue Jan 23 15:06:02 2007 -0800

    Adjusted column widths of 'show vpn ike sa' command output so that the output is 80 columns wide.  Bug 1659 fix.

commit 5fd0f1b28475966e5100f201d939ce894ce5fb19
Author: Stig Thormodsrud <stig at vyatta.com>
Date:   Tue Jan 23 14:56:44 2007 -0800

    - Fix multinode processing of "set vpn ipsec log log-mode".
    - Remove "none" option.

commit 03f8cc4586396d5f11bd1ecfe0bd1d85a90356d7
Merge: 55c19d19f192b7df45e92401a00fb802ea8ebbe6 cf2bda8e971fb020d550d0817edd88cf6014b91b
Author: Stig Thormodsrud <stig at vyatta.com>
Date:   Fri Jan 19 17:50:45 2007 -0800

    Merge branch 'alameda' of git://git.vyatta.com/xorp into alameda

commit 55c19d19f192b7df45e92401a00fb802ea8ebbe6
Author: Stig Thormodsrud <stig at vyatta.com>
Date:   Fri Jan 19 17:45:43 2007 -0800

    Add subroutine to check for valid interfaces. Bug 1645.

commit cf2bda8e971fb020d550d0817edd88cf6014b91b
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Jan 19 17:43:02 2007 -0800

    When component is removed delete by root node component needs to be cleaned up in shutdown method.

commit f45b6b71048abe0248403f0047659599efee3df4
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Jan 19 17:34:02 2007 -0800

    Needs correct name in template otherwise the universe is skewed.

commit b59fa1f3345595f6bb184bd8435e3222dd124d5a
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Jan 19 16:43:49 2007 -0800

    Reverting relative pathing--explicit pathing needed for non-root.

commit fb1cd1888656b776d421efccec3ebb9c9d00def9
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Jan 19 15:53:51 2007 -0800

    Fix for executing vpn show commands within image.

commit 957250de91ced230c4d840d3cb704479a3dcf18e
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Thu Jan 18 17:44:11 2007 -0800

    Add full privileges to VPN show commands
    Add missing help strings

commit 40a22fa1ba95a9718a4b4076ee811281c6873622
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Thu Jan 18 17:26:03 2007 -0800

    Run VPN scripts with full privileges

commit a453fa15b698b57844314bb0c9da88d260dd9554
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Thu Jan 18 16:52:37 2007 -0800

    Set ICMP redirects based on VPN configuration

commit 0bef0acc1ff6ea5c8889ed4669b53407454853fa
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Thu Jan 18 16:23:59 2007 -0800

    Move operational commands under vpn
    Set path to rl_cmd_proc

commit 7dd267fef6d0d0413b374db47dfe4773fc7a482b
Author: Robert Bays <rbays at phuket.vyatta.com>
Date:   Thu Jan 18 12:34:33 2007 -0800

    fix ifrename on startup when intertfaces exist.

commit 7688886a435bbcfd03c639f65cb9438affe56d20
Merge: 1634b0b968f7e7fbb1e16ca5e666966547f99d42 78c201aa700129074b56feb9d1e5c48b13af925d
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Wed Jan 17 20:20:02 2007 -0800

    Merge branch 'master' of marat at phuket:/usr/local/git/vyattacli

commit 1634b0b968f7e7fbb1e16ca5e666966547f99d42
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Wed Jan 17 20:19:50 2007 -0800

    Added rl_xg/basic/common_xml.??

commit 78c201aa700129074b56feb9d1e5c48b13af925d
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Wed Jan 17 16:49:24 2007 -0800

    Added xrl statement at root of rl_vpn node to cleanup root vpn module on shutdown. Now the command will be within the scope of the transaction. Also removed permanent node within the rl_vpn.tp file.

commit 77c564f8a02db0553dce2d0f6f0b821717615157
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Wed Jan 17 12:02:53 2007 -0800

    Split out libbasic.

commit e48bf96e7bbeb2971204cbaaa92c199dba37812d
Merge: 13013971cae5ffb2242f2bff13f69aba58d5f39d b9d70bacb63b7a7b48839da99742700863ce1a2c
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 16 17:37:32 2007 -0800

    Merge branch 'master' of /usr/local/git/vyattacli

commit 13013971cae5ffb2242f2bff13f69aba58d5f39d
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 16 17:36:41 2007 -0800

    Add range limits and sort proposal numbers

commit b9d70bacb63b7a7b48839da99742700863ce1a2c
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Tue Jan 16 16:49:08 2007 -0800

    Removed stale rl_xg/Makefile.am-OLD

commit d4ba37fd2be5239afe8c8d1fff7c03f52a2aac5c
Merge: 3903bf2f467207adeeb6e13607d999b7a19f52d4 3bac28ae3278a2927a255fe25aebe12dd54cbac4
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Tue Jan 16 16:47:13 2007 -0800

    Merge branch 'master' of marat at phuket:/usr/local/git/vyattacli

commit 3903bf2f467207adeeb6e13607d999b7a19f52d4
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Tue Jan 16 16:46:46 2007 -0800

    Sorted rl_xg/include.am

commit 3bac28ae3278a2927a255fe25aebe12dd54cbac4
Merge: 102d68ef268962cf822882a2d5d73f43f13dad9e 5322b414df054185071f3867cc9a66fdaee5ee4d
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 16 16:30:14 2007 -0800

    Merge branch 'master' of /usr/local/git/vyattacli

commit 102d68ef268962cf822882a2d5d73f43f13dad9e
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 16 16:29:57 2007 -0800

    Add stricter group check
    Support top-level VPN configuration deletion

commit 729332085ff1efdef45dbff8004b682cd85277f6
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 16 16:28:26 2007 -0800

    Change subnet validation to ipv4net
    Create/delete directories to support section delete

commit 5322b414df054185071f3867cc9a66fdaee5ee4d
Merge: 90c5e1424aaa02c4d9be8a4a3f03f6e04c0c16aa 7070162e1f8e112537186c70d8447831a9a8b509
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Tue Jan 16 16:07:00 2007 -0800

    Merge branch 'origin' into working_vyattacli

commit 90c5e1424aaa02c4d9be8a4a3f03f6e04c0c16aa
Merge: c12a32c66806c4ef90df8acb15c42bdf2ba4445b d2b79083b31725c2c69cbc2dd8853cc067aef9bb
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Tue Jan 16 15:44:38 2007 -0800

    Merge branch 'vyattacli' into working_vyattacli

commit d2b79083b31725c2c69cbc2dd8853cc067aef9bb
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Tue Jan 16 15:32:43 2007 -0800

    Moved rl_xg/xgcgi/basic_client.?? to rl_xg/basic_client/ to compile into library libbasicclient.la

commit 300f77d4e7f4a12527bc7135640331c7be40272c
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Tue Jan 16 11:04:07 2007 -0800

    Split out BasicErrorInfo.

commit 9b6e7048ddd58d4a7fe4b6785c132ac1b00c8ce3
Merge: e275a29184459e1e9e76b3af6dfd294438e18eaa b1275d56d77460ed2f057fd8df481c9a3ffaa3d6
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Mon Jan 15 17:44:28 2007 -0800

    Merge branch 'master' of /usr/local/git/vyattacli

commit e275a29184459e1e9e76b3af6dfd294438e18eaa
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Mon Jan 15 17:44:15 2007 -0800

    Add pluto debugging
    Correct ESP key lifetime

commit b1275d56d77460ed2f057fd8df481c9a3ffaa3d6
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Mon Jan 15 17:12:51 2007 -0800

    Split out basic_xgdaemon_client.??

commit 7919fd9a4d7a3ac38f7d7f23a9186de37b7c37d5
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Mon Jan 15 16:28:50 2007 -0800

    Renamed XGCGI in xgcgi2.cc to XGCGI2.

commit e4621049ed606acb59dd712aba0c826c46719a45
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Mon Jan 15 16:00:17 2007 -0800

    Now using BasicXGDaemonClient rather than XGDaemonClient in xgcgi2.

commit c025ac0d41f40872180e27259a21f9f56b34743b
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Mon Jan 15 15:57:53 2007 -0800

    Removed extraneous lines from rl_xg/include.am

commit d3a2b68a30266f1ee1026d699ebd23c20afb8cfb
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Mon Jan 15 15:44:12 2007 -0800

    Split out BasicXGDaemonClient

commit f9d0b2ab82f3768a9c53a2c87cb133ebbe6dd85d
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Mon Jan 15 14:35:29 2007 -0800

    Split out libcgi.la

commit c12a32c66806c4ef90df8acb15c42bdf2ba4445b
Merge: 4a6c61a41ca605a5137ffceeefb1e52c876d0c91 0442486a2530076eb88c6dc883ef5369f2e00815
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Jan 12 10:00:23 2007 -0800

    Merge branch 'origin' into working_vyattacli

commit 56fe67d26479bd7b417eccb89030660b655b5dbf
Merge: 06d5df5696b36db989b8477ed37ce04d0cd94294 507ed659826391630fc391b752aa37e9e688b085
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Thu Jan 11 18:10:56 2007 -0800

    Merge branch 'master' of /usr/local/git/vyattacli

commit 06d5df5696b36db989b8477ed37ce04d0cd94294
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Thu Jan 11 18:10:37 2007 -0800

    Provide explicit exit code for commit notification

commit 507ed659826391630fc391b752aa37e9e688b085
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Thu Jan 11 13:02:41 2007 -0800

    Updated template file etc/templates/rl_vpn.cmds with VPN operational commands.

commit f9c5693fbff97528ad624c0c36ece05591e381d8
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Thu Jan 11 12:50:33 2007 -0800

    Renamed vpn-specific xsl files show_*.xsl to show_vpn_*.xsl as requested.

commit 8ef540c6071bf78289e7c22e7a2ef7f9dcf5f91f
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Thu Jan 11 12:17:42 2007 -0800

    Added show_vpn_ipsec_status.xsl

commit 189537517e833218dcbf9f57cebde5d0e500eb49
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Wed Jan 10 18:16:27 2007 -0800

    Added show_ike_sa.xsl

commit 799ddb4f41a1b197e242e4beb8958424abda04e2
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Wed Jan 10 18:06:32 2007 -0800

    Updated comment to indicate correct module name.

commit c7502c786d6b5f892e87d64f53efbaba627e9a3e
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Wed Jan 10 18:00:03 2007 -0800

    Updated comment to indicate the correct command.

commit 01702491ad2f21701046dbf94e049f14d1ccd326
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Wed Jan 10 17:57:50 2007 -0800

    Added show_ipsec_sa.xsl

commit 47cf0a14b75cb6fd80963de73519ed78e8a39974
Author: Robert Bays <rbays at phuket.vyatta.com>
Date:   Wed Jan 10 17:55:16 2007 -0800

    fix for bug 1620: Create a method to preserve interface numbering information in config partition

commit e9a46a307b963aeda045acbed6feabf034a37c2d
Merge: a86bab1df2386c6609624360ff4aa8e60c61586d 2eaee1dda5c9fc58f517ea64b9f5eaad916a918d
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Jan 10 16:40:16 2007 -0800

    Merge branch 'master' of /usr/local/git/vyattacli

commit a86bab1df2386c6609624360ff4aa8e60c61586d
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Jan 10 16:39:54 2007 -0800

    Remove default value dh-group (optional)
    Comment out log-mode
    Change subnets to text type to support 'any'

commit ee2a80d25691ee6fe2d584684bcbbd8cb5869a59
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Jan 10 16:28:32 2007 -0800

    Add configuration data to handle changes in tunnel configuration

commit 69c6e0c29645df1834bf6da2537438924ae22559
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Jan 10 16:23:19 2007 -0800

    Correct conversion of %any

commit 2eaee1dda5c9fc58f517ea64b9f5eaad916a918d
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Wed Jan 10 15:40:00 2007 -0800

    Added show_ipsec_sa_statistics.xsl

commit e35508804c40ef1c740fee930a7ffd93d3408fa8
Merge: 9f482edb5bf8104a3706c3bb8b8baee29834fddf 6264b01fd127fb2726a7949fdb09140113a4ee32
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Jan 10 12:35:50 2007 -0800

    Merge branch 'master' of /usr/local/git/vyattacli

commit 9f482edb5bf8104a3706c3bb8b8baee29834fddf
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Jan 10 12:35:33 2007 -0800

    Change VPN sha2 hash to sha2_256, sha2_384 and sha2_512.

commit 6264b01fd127fb2726a7949fdb09140113a4ee32
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Tue Jan 9 18:07:38 2007 -0800

    Changed peer to peer_ip.

commit 4a6c61a41ca605a5137ffceeefb1e52c876d0c91
Merge: bd7344ea6de82e88a1a1b70b5c94f05e4f68b769 b38c003084b17e9300be293a53cff2d92a56e0d1
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Tue Jan 9 17:36:55 2007 -0800

    Merge branch 'vyattacli' into working_vyattacli

commit bd7344ea6de82e88a1a1b70b5c94f05e4f68b769
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Tue Jan 9 17:35:39 2007 -0800

    Implementation of nested setkey structure--should have everything at this point, but lifetime.

commit b38c003084b17e9300be293a53cff2d92a56e0d1
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 9 17:22:27 2007 -0800

    Disable implicit VPN connections

commit c167d3e8759460ea06dfc076c1f9ab8b3fd209b6
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 9 16:30:21 2007 -0800

    Revise configuration print function

commit 2e88bb031046d1b8e27daed297bdf99707cb4a2a
Merge: 0adaad9fb9385b4f205969b7834c8f620a826ea5 af8e1ee98606a4a1de3aad4c5a4ad34982dce251
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 9 15:06:49 2007 -0800

    Merge branch 'master' of /usr/local/git/vyattacli

commit 0adaad9fb9385b4f205969b7834c8f620a826ea5
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 9 15:06:42 2007 -0800

    Add (incomplete) logic to handle changes in tunnel configuration

commit af8e1ee98606a4a1de3aad4c5a4ad34982dce251
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Tue Jan 9 10:35:38 2007 -0800

    Added interface validation into cmd processor for vpn output. also added dependency on the rlxorp library--will need to verify that this doesn't break some of the sablot functions as it did in the past.

commit 147aab20b10006024e3f2a8fe88d2615d3dbc954
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Mon Jan 8 15:34:25 2007 -0800

    Additional fixes to rl_cmd_proc for vpn--added bytes and interfaces.

commit 8bf16d53fc471358cd89d685479d5c6361b0d864
Merge: 22b32575fbe15f68bc50bb5ccfc9646e2c1ffc03 8e2c781ff9631d552459498b17cbbf851bd34371
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Mon Jan 8 15:10:19 2007 -0800

    Merge branch 'master' of marat at phuket:/usr/local/git/vyattacli

commit 22b32575fbe15f68bc50bb5ccfc9646e2c1ffc03
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Mon Jan 8 15:09:53 2007 -0800

    Added show ike status XSL and command.

commit 8e2c781ff9631d552459498b17cbbf851bd34371
Merge: c8fd4116b0fd7ba076dcfea402eb45efd86b46b3 ffe40d6140b2ae27a2065740b5a58c12833cf3d2
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Mon Jan 8 14:48:50 2007 -0800

    Merge branch 'vyattacli' into working_vyattacli

commit c8fd4116b0fd7ba076dcfea402eb45efd86b46b3
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Mon Jan 8 14:47:02 2007 -0800

    Updated xml processor for vpn commands--bug fixes to included additional fields.

commit ffe40d6140b2ae27a2065740b5a58c12833cf3d2
Merge: 934792b7f4bce6e72b530ea7fccc348f3fd0b81b 80611ad2b9ba54a44416ea30a213457c5175ad0b
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Mon Jan 8 14:36:45 2007 -0800

    Merge branch 'master' of /usr/local/git/vyattacli

commit 934792b7f4bce6e72b530ea7fccc348f3fd0b81b
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Mon Jan 8 14:36:38 2007 -0800

    Initial cut of VPN tunnel configuration

commit 80611ad2b9ba54a44416ea30a213457c5175ad0b
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Mon Jan 8 11:45:38 2007 -0800

    Added support for parsing of netkey commands into intermediate xml format. Ready for initial xsl pass.

commit c37ff08b606228496f60ae61b5e2fb82bf09193f
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Mon Jan 8 11:27:06 2007 -0800

    Add tunnel interface configuration & help strings

commit 158e44bf48a43c1a89967abf208d138642925cc1
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Jan 5 10:17:40 2007 -0800

    Files also needed as part of the interfaces tunnel project.

commit 57bdcccaf8af7ec5964b031424db0e61820fd991
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Jan 5 10:15:49 2007 -0800

    added new vpn tunnel binary and template project

commit 132897a9b32c670bce5dbbad641852bb5a78996f
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Thu Jan 4 13:23:22 2007 -0800

    check the return status instead of stderror failure.

commit 052e1d7b4bfdb5cc38ea4e83e76b7619bb9fa45c
Merge: d6bc6f5546ba8fd40b8a71d1d2070ec2b1b43f34 c3fab87428c01482eb19e48effe461bb6ff6cda5
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Thu Jan 4 09:15:43 2007 -0800

    Merge branch 'vyattacli' into working_vyattacli

commit d6bc6f5546ba8fd40b8a71d1d2070ec2b1b43f34
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Thu Jan 4 09:13:43 2007 -0800

    Additional processing of vpn show commands, also added hook for program failure--will fail program on stderrfrom pgm.

commit c3fab87428c01482eb19e48effe461bb6ff6cda5
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Jan 3 17:16:29 2007 -0800

    Add VPN configuration help strings

commit 541df0c8105412f2b2e8e2c416cfda5bfe391ce7
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Jan 3 13:07:36 2007 -0800

    Add VPN operational commands template

commit 1b9aab980e14bcb785b2cd428f2131dfbdf3ab37
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Jan 3 12:39:43 2007 -0800

    Add logging commands to Openswan configuration

commit 1dfd47e404468888e703a52a539b1a694dccd74f
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Jan 3 11:38:05 2007 -0800

    Add VPN templates

commit 8a11ee6f45139e56c07ea86bfad42863f4fba310
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Jan 3 11:09:40 2007 -0800

    Add VPN scripts to libexec/xorp

commit 82fe48296ef05d95efbe6137568f8accdf66b6bf
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Jan 3 11:08:59 2007 -0800

    Use libexec/xorp for VPN scripts

commit 624404fe078d0a706e12c22da2403ad24b1b2df6
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Jan 3 11:07:49 2007 -0800

    Correct full path to configuration directory
    Use libexec/xorp for VPN scripts

commit 976dcecf5ded8cae04d3f47b7910ea3b6013e3c3
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 2 12:09:29 2007 -0800

    Add vpn-commit to start or stop Openswan based on configuration and configuration validity

commit 30e1678eea89f2ad837b7f0c91b9081d5bb7e228
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 2 11:11:07 2007 -0800

    Change configuration directory and directory format
    Add basic VPN show command

commit 4a4423fe31ca90438446f2c78a0654e9430e43e3
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 2 11:07:33 2007 -0800

    Change configuration directory and Perl module location

commit 6a92dbf1c011a464230a5afddafe314ab875a144
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 2 07:46:28 2007 -0800

    Remove dash from aes-128 and aes-256 to match Openswan configuration

commit f92d252c3a17ef91b07d66791fbb0761b9cd8af4
Merge: a732df8670208b4cbf5cd5a132d8c6a0ee2a70f4 5475f3fb81aa869cc330ee3b9125bf3fa22bc0ff
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Sat Dec 23 07:20:41 2006 -0800

    Merge branch 'vyattacli' into working_vyattacli

commit a732df8670208b4cbf5cd5a132d8c6a0ee2a70f4
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Sat Dec 23 07:12:27 2006 -0800

    removed the reference to xrl commit as this appears to squash the program statement.

commit 5475f3fb81aa869cc330ee3b9125bf3fa22bc0ff
Merge: 3b5c73253d81d7588209f1112b487390450f657a 244ce40aabaee1b7604e081617fd8137180dfb40
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Fri Dec 22 16:54:01 2006 -0800

    Merge /usr/local/git/vyattacli

commit 3b5c73253d81d7588209f1112b487390450f657a
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Fri Dec 22 16:52:41 2006 -0800

    Adjust for configuration directory structure changes
    Add debug option to configuration script

commit 244ce40aabaee1b7604e081617fd8137180dfb40
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Dec 22 15:51:52 2006 -0800

    Added handler code for errors on commit to be returned back to user user process.

commit 2ce9a5a88622ab0768abef209bf5426fdc95aa6c
Merge: 116d283582ccdcc4d7233fc7e4507307f7e9ceb2 316cdfeb8bc25bb97bac1b5775055d53b197e0f4
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Dec 22 13:11:56 2006 -0800

    Merge branch 'master' of /usr/local/git/vyattacli into working_vyattacli

commit 116d283582ccdcc4d7233fc7e4507307f7e9ceb2
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Dec 22 12:57:45 2006 -0800

    modified to move closer to merge state

commit 3eda1c98f3f9a86ec869c75b57f49649220c26c7
Merge: 3f267af8f3e47ad059c55df0aa2c7583f5d696ed 9c284d5efcf1b6a9a41b65103ea4b4fe582d441e
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Dec 22 12:53:32 2006 -0800

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

commit 3f267af8f3e47ad059c55df0aa2c7583f5d696ed
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Dec 22 12:53:27 2006 -0800

    Added show command support for vpn secrets file. Also modified template file to remove status files and not clean directory on start-commit.

commit 316cdfeb8bc25bb97bac1b5775055d53b197e0f4
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Thu Dec 21 17:45:26 2006 -0800

    Add Openswan VPN configuration scripts

commit 5b0bcf73da062fee09e10d0a48b860d49124e965
Merge: b35bfa2e25ae33e6f8b9a721db1b7707ce886af7 85a894bbdbd9499fefb4b8d6d8315879c8cb052b
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Wed Dec 20 14:46:29 2006 -0800

    Merge branch 'tempcli' into working_vyattacli

commit b35bfa2e25ae33e6f8b9a721db1b7707ce886af7
Merge: 648e2eede3f8090a580fca118c03bdd8bbde0400 e266b2e7d017ee8d101582589e601e62b4c01b3f
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Wed Dec 20 14:41:19 2006 -0800

    Merge branch 'vyattacli' into working_vyattacli

commit 648e2eede3f8090a580fca118c03bdd8bbde0400
Merge: 3643c9295ee1cd83ee2110b89e3a4352034806c7 8ffa7708360cbb977632174703802e35744dca62
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Wed Dec 20 14:40:47 2006 -0800

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

commit e266b2e7d017ee8d101582589e601e62b4c01b3f
Merge: f1e92f130813156e8431e798af4433be7f2e2bd4 804235bf41bf817437034416e2572fecdb27cea2
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Wed Dec 20 14:39:30 2006 -0800

    Added command processing for vpn show commands.
    
    Merge branch 'master' into vyattacli
    
    Conflicts:
    
    	rl_xg/html/css/main.css

commit 3643c9295ee1cd83ee2110b89e3a4352034806c7
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Tue Dec 19 17:13:54 2006 -0800

    added status file to handle deletion of nodes in vpn, and cleaning of config tree at start of commit.

commit 85a894bbdbd9499fefb4b8d6d8315879c8cb052b
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Tue Dec 19 14:56:50 2006 -0800

    Adjusted margins.

commit 036ee691982eadf7248dbbd7b93feb8202f973cf
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Mon Dec 18 10:12:58 2006 -0800

    Added to template to build out all nodes in directory config--only leafs generated directory construction at this point.

commit ff43bb20989fd0555f90cbdb8092581e95ff04c9
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Mon Dec 18 09:01:15 2006 -0800

    Added rl_vpn.tp to the include file so that it is installed as part of the image

commit ac69cfc1462980814a5183d7b7e1f00ac9ca30bc
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Dec 15 16:44:01 2006 -0800

    Fixed template to work with current image and create directory (structure subject to change).

commit f25a55a20d9bfd4e8be9ad9c64a226d2ddd5cca6
Merge: 2f892227238c48b150ffe871b5b7aee5b2dfecc9 f1e92f130813156e8431e798af4433be7f2e2bd4
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Dec 15 15:27:19 2006 -0800

    Merge branch 'vyattacli' into working_vyattacli

commit 2f892227238c48b150ffe871b5b7aee5b2dfecc9
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Dec 15 15:23:00 2006 -0800

    Merging xgdaemon changes.

commit 0f1e596b85469ad2d91dd13abd4b702e84535088
Merge: c6e7ca6856051b2a40e07cfd68eea21e92773e69 804235bf41bf817437034416e2572fecdb27cea2
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Dec 15 11:00:17 2006 -0800

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

commit c6e7ca6856051b2a40e07cfd68eea21e92773e69
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Dec 15 11:00:02 2006 -0800

    Added more files to initial checkin.

commit be96084ee8cc6783d0e38e5ea3a6c4d07a6e62ac
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Dec 15 10:59:08 2006 -0800

    Initial checkin of dummy vrp module

commit f1e92f130813156e8431e798af4433be7f2e2bd4
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Thu Dec 14 16:54:35 2006 -0800

    Implemented GUI client area auto-adjustment in relation to browser window resize.

commit 98ba6db1ce490eca17d099bf79f2fa768880cd24
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Thu Dec 14 16:41:01 2006 -0800

    Revert "Added hook for commit at end of commit operations."
    
    This reverts commit 01e603d5463aefd88eb1797711c68b3dca5b5f56.

commit b5d0d97f2f16876a2af6f512f895e25897a5ba46
Merge: 0389f54890fc529f3f4a4886991357235ef27350 2f5ca474a1da7c79797df9e6cc90004d6f71ec38
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Thu Dec 14 16:17:47 2006 -0800

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

commit 0389f54890fc529f3f4a4886991357235ef27350
Merge: 0b795963a6b9c2e9b337daf7e9dbcfb351215f8e d850252b1eb85d65f14068fab0969ee290377577
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Thu Dec 14 09:38:09 2006 -0800

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

commit 0b795963a6b9c2e9b337daf7e9dbcfb351215f8e
Merge: 01e603d5463aefd88eb1797711c68b3dca5b5f56 4236f9b6719e74e90f506df71c35e4418db3b527
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Dec 8 21:42:22 2006 -0800

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

commit 01e603d5463aefd88eb1797711c68b3dca5b5f56
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Dec 8 21:41:40 2006 -0800

    Added hook for commit at end of commit operations.

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


More information about the svn mailing list