--- west-console.txt	2008-02-14 02:01:43.000000000 -0500
+++ OUTPUT/26westconsole-fixed.txt	2008-02-14 04:23:39.000000000 -0500
@@ -24,8 +24,9 @@
 west:~#
  ipsec setup start
 ipsec_setup: Starting Openswan IPsec VERSION
+ipsec_setup: /usr/local/lib/ipsec/_startklips: -f: command not found
 west:~#
- /testing/pluto/basic-pluto-01/eroutewait.sh trap
+ /testing/pluto/bin/wait-until-pluto-started
 west:~#
  ipsec auto --add westnet-eastnet-aggr
 west:~#
@@ -34,28 +35,16 @@
 west:~#
  ipsec auto --up  westnet-eastnet-aggr
 112 "westnet-eastnet-aggr" #1: STATE_AGGR_I1: initiate
-003 "westnet-eastnet-aggr" #1: received Vendor ID payload [Dead Peer Detection]
-003 "westnet-eastnet-aggr" #1: received Vendor ID payload [RFC 3947] method set to=109 
-003 "westnet-eastnet-aggr" #1: NAT-Traversal: Only 0 NAT-D - Aborting NAT-Traversal negotiation
-004 "westnet-eastnet-aggr" #1: STATE_AGGR_I2: sent AI2, ISAKMP SA established {auth=OAKLEY_RSA_SIG cipher=oakley_3des_cbc_192 prf=oakley_sha group=modp1536}
-117 "westnet-eastnet-aggr" #2: STATE_QUICK_I1: initiate
-004 "westnet-eastnet-aggr" #2: STATE_QUICK_I2: sent QI2, IPsec SA established tunnel mode
+031 "westnet-eastnet-aggr" #1: max number of retransmissions (2) reached STATE_AGGR_I1
+000 "westnet-eastnet-aggr" #1: starting keying attempt 2 of at most 3, but releasing whack
 west:~#
  ipsec look
 west NOW
-0.0.0.0/0          -> 0.0.0.0/0          => %trap
-192.0.1.0/24       -> 192.0.2.0/24       => tun0xIPIP@192.1.2.23 esp0xESPSPI@192.1.2.23
 ipsec0->eth1 mtu=16260(9999)->1500
-tun0xTUN#@192.1.2.23 IPIP: dir=out src=192.1.2.45 natencap=none natsport=0 natdport=0  
-esp0xKLIPSPIK@192.1.2.23 ESP_AES_HMAC_SHA1: dir=out src=192.1.2.45 iv_bits=128bits iv=0xIVISFORRANDOM000IVISFORRANDOM000 ooowin=64 alen=160 aklen=160 eklen=128 natencap=none natsport=0 natdport=0  
-esp0xKLIPSPIK@192.1.2.45 ESP_AES_HMAC_SHA1: dir=in  src=192.1.2.23 iv_bits=128bits iv=0xIVISFORRANDOM000IVISFORRANDOM000 ooowin=64 alen=160 aklen=160 eklen=128 natencap=none natsport=0 natdport=0  
-tun0xTUN#@192.1.2.45 IPIP: dir=in  src=192.1.2.23 policy=192.0.2.0/24->192.0.1.0/24 flags=0x8<> natencap=none natsport=0 natdport=0  
 ROUTING TABLE
 192.1.2.0/24 dev eth1  proto kernel  scope link  src 192.1.2.45 
 192.1.2.0/24 dev ipsec0  proto kernel  scope link  src 192.1.2.45 
-192.0.2.0/24 dev ipsec0  scope link 
-0.0.0.0/1 dev ipsec0  scope link 
-128.0.0.0/1 dev ipsec0  scope link 
+192.0.2.0/24 via 192.1.2.23 dev eth1 
 default via 192.1.2.254 dev eth1 
 west:~#
  echo done
@@ -66,21 +55,11 @@
 west:~#
  ipsec look
 west NOW
-0.0.0.0/0          -> 0.0.0.0/0          => %trap
-192.0.1.0/24       -> 192.0.2.0/24       => tun0xIPIP@192.1.2.23 esp0xESPSPI@192.1.2.23
 ipsec0->eth1 mtu=16260(9999)->1500
-tun0xTUN#@192.1.2.23 IPIP: dir=out src=192.1.2.45 natencap=none natsport=0 natdport=0  
-esp0xKLIPSPIK@192.1.2.23 ESP_AES_HMAC_SHA1: dir=out src=192.1.2.45 iv_bits=128bits iv=0xIVISFORRANDOM000IVISFORRANDOM000 ooowin=64 alen=160 aklen=160 eklen=128 natencap=none natsport=0 natdport=0  
-tun0xTUN#@192.1.2.23 IPIP: dir=out src=192.1.2.45 natencap=none natsport=0 natdport=0  
-esp0xKLIPSPIK@192.1.2.23 ESP_AES_HMAC_SHA1: dir=out src=192.1.2.45 iv_bits=128bits iv=0xIVISFORRANDOM000IVISFORRANDOM000 ooowin=64 alen=160 aklen=160 eklen=128 natencap=none natsport=0 natdport=0  
-esp0xKLIPSPIK@192.1.2.45 ESP_AES_HMAC_SHA1: dir=in  src=192.1.2.23 iv_bits=128bits iv=0xIVISFORRANDOM000IVISFORRANDOM000 ooowin=64   alen=160 aklen=160 eklen=128  natencap=none natsport=0 natdport=0  
-tun0xTUN#@192.1.2.45 IPIP: dir=in  src=192.1.2.23 policy=192.0.2.0/24->192.0.1.0/24 flags=0x8<>  natencap=none natsport=0 natdport=0  
 ROUTING TABLE
 192.1.2.0/24 dev eth1  proto kernel  scope link  src 192.1.2.45 
 192.1.2.0/24 dev ipsec0  proto kernel  scope link  src 192.1.2.45 
-192.0.2.0/24 dev ipsec0  scope link 
-0.0.0.0/1 dev ipsec0  scope link 
-128.0.0.0/1 dev ipsec0  scope link 
+192.0.2.0/24 via 192.1.2.23 dev eth1 
 default via 192.1.2.254 dev eth1 
 west:~#
 west:~#