removed all nexthop statements

testing/tests/ike/rw-cert/hosts/dave/etc/ipsec.conf

@@ -12,7 +12,6 @@ conn %default
 
 conn home
 	left=PH_IP_DAVE
-	leftnexthop=%direct
 	leftcert=daveCert.pem
 	[email protected]
 	right=PH_IP_MOON

testing/tests/ike/rw-cert/hosts/moon/etc/ipsec.conf

@@ -12,7 +12,6 @@ conn %default
 
 conn rw
 	left=PH_IP_MOON
-	leftnexthop=%direct
 	leftcert=moonCert.pem
 	[email protected]
 	leftsubnet=10.1.0.0/16

testing/tests/ike/rw_v1-net_v2/hosts/moon/etc/ipsec.conf

@@ -8,7 +8,6 @@ conn %default
 	ikelifetime=60m
 	keylife=20m
 	left=PH_IP_MOON
-	leftnexthop=%direct
 	leftcert=moonCert.pem
 	[email protected]
 	leftsubnet=10.1.0.0/16

testing/tests/ikev1/alg-blowfish/hosts/carol/etc/ipsec.conf

@@ -13,9 +13,9 @@ conn %default
 	keyingtries=1
 	ike=blowfish256-sha2_512-modp4096!
 	esp=blowfish256-sha2_256!
+
 conn home
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	[email protected]
 	right=PH_IP_MOON

testing/tests/ikev1/alg-blowfish/hosts/moon/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
-	leftnexthop=%direct
 	ike=blowfish256-sha2_512-modp4096!
 	esp=blowfish256-sha2_256!
 

testing/tests/ikev1/alg-serpent/hosts/carol/etc/ipsec.conf

@@ -13,9 +13,9 @@ conn %default
 	keyingtries=1
 	ike=serpent256-sha2_512-modp4096!
 	esp=serpent256-sha2_256!
+
 conn home
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	[email protected]
 	right=PH_IP_MOON

testing/tests/ikev1/alg-serpent/hosts/moon/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
-	leftnexthop=%direct
 	ike=serpent256-sha2_512-modp4096!
 	esp=serpent256-sha2_256!
 

testing/tests/ikev1/alg-sha-equals-sha1/hosts/carol/etc/ipsec.conf

@@ -16,7 +16,6 @@ conn %default
 
 conn home
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	[email protected]
 	right=PH_IP_MOON

testing/tests/ikev1/alg-sha-equals-sha1/hosts/moon/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
-	leftnexthop=%direct
 	ike=aes128-sha1-modp1536!
 	esp=aes128-sha!
 

testing/tests/ikev1/alg-sha2_256/hosts/carol/etc/ipsec.conf

@@ -13,9 +13,9 @@ conn %default
 	keyingtries=1
 	ike=aes128-sha2_256-modp1536!
 	esp=aes128-sha2_256!
+
 conn home
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	[email protected]
 	right=PH_IP_MOON

testing/tests/ikev1/alg-sha2_256/hosts/moon/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
-	leftnexthop=%direct
 	ike=aes128-sha2_256-modp1536!
 	esp=aes128-sha2_256!
 

testing/tests/ikev1/alg-twofish/hosts/carol/etc/ipsec.conf

@@ -13,9 +13,9 @@ conn %default
 	keyingtries=1
 	ike=twofish256-sha2_512-modp4096!
 	esp=twofish256-sha2_256!
+
 conn home
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	[email protected]
 	right=PH_IP_MOON

testing/tests/ikev1/alg-twofish/hosts/moon/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
-	leftnexthop=%direct
 	ike=twofish256-sha2_512-modp4096!
 	esp=twofish256-sha2_256!
 

testing/tests/ikev1/attr-cert/hosts/carol/etc/ipsec.conf

@@ -12,7 +12,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	[email protected]
 	right=PH_IP_MOON

testing/tests/ikev1/attr-cert/hosts/dave/etc/ipsec.conf

@@ -12,7 +12,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_DAVE
-	leftnexthop=%direct
 	leftcert=daveCert.pem
 	[email protected]
 	right=PH_IP_MOON

testing/tests/ikev1/attr-cert/hosts/moon/etc/ipsec.conf

@@ -12,7 +12,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_MOON
-	leftnexthop=%direct
 	leftcert=moonCert.pem
 	[email protected]
 

testing/tests/ikev1/compress/hosts/carol/etc/ipsec.conf

@@ -15,7 +15,6 @@ conn %default
 
 conn home
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	[email protected]
 	right=PH_IP_MOON

testing/tests/ikev1/compress/hosts/moon/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
-	leftnexthop=%direct
 	compress=yes
 
 conn rw

testing/tests/ikev1/crl-from-cache/hosts/carol/etc/ipsec.conf

@@ -13,7 +13,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	[email protected]
 

testing/tests/ikev1/crl-from-cache/hosts/moon/etc/ipsec.conf

@@ -13,7 +13,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_MOON
-	leftnexthop=%direct
 	leftcert=moonCert.pem
 	[email protected]
 

testing/tests/ikev1/crl-ldap/hosts/carol/etc/ipsec.conf

@@ -20,7 +20,6 @@ conn %default
 
 conn home
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	[email protected]
 	leftfirewall=yes

testing/tests/ikev1/crl-ldap/hosts/moon/etc/ipsec.conf

@@ -18,7 +18,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=2
 	left=PH_IP_MOON
-	leftnexthop=%direct
 	leftcert=moonCert.pem
 	[email protected]
 	leftfirewall=yes

testing/tests/ikev1/crl-revoked/hosts/carol/etc/ipsec.conf

@@ -12,7 +12,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolRevokedCert.pem
 	[email protected]
 

testing/tests/ikev1/crl-revoked/hosts/moon/etc/ipsec.conf

@@ -12,7 +12,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_MOON
-	leftnexthop=%direct
 	leftcert=moonCert.pem
 	[email protected]
 

testing/tests/ikev1/crl-strict/hosts/carol/etc/ipsec.conf

@@ -12,7 +12,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	[email protected]
 

testing/tests/ikev1/crl-strict/hosts/moon/etc/ipsec.conf

@@ -12,7 +12,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_MOON
-	leftnexthop=%direct
 	leftcert=moonCert.pem
 	[email protected]
 

testing/tests/ikev1/crl-to-cache/hosts/carol/etc/ipsec.conf

@@ -12,7 +12,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	[email protected]
 

testing/tests/ikev1/crl-to-cache/hosts/moon/etc/ipsec.conf

@@ -12,7 +12,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_MOON
-	leftnexthop=%direct
 	leftcert=moonCert.pem
 	[email protected]
 

testing/tests/ikev1/default-keys/hosts/carol/etc/ipsec.conf

@@ -15,7 +15,6 @@ conn %default
 
 conn home
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=selfCert.der
 	leftsendcert=never
 	leftfirewall=yes

testing/tests/ikev1/default-keys/hosts/moon/etc/ipsec.conf

@@ -15,7 +15,6 @@ conn %default
 
 conn carol
 	left=PH_IP_MOON
-	leftnexthop=%direct
 	leftcert=selfCert.der
 	leftsendcert=never
 	leftfirewall=yes

testing/tests/ikev1/dpd-clear/hosts/moon/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
-	leftnexthop=%direct
 	dpdaction=clear
 	dpddelay=10
 	dpdtimeout=30

testing/tests/ikev1/esp-ah-transport/hosts/carol/etc/ipsec.conf

@@ -17,7 +17,6 @@ conn %default
 
 conn home
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	[email protected]
 	leftfirewall=yes

testing/tests/ikev1/esp-ah-transport/hosts/moon/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
-	leftnexthop=%direct
 	auth=ah
 	ike=aes128-sha
 	esp=aes128-sha1

testing/tests/ikev1/esp-ah-tunnel/hosts/carol/etc/ipsec.conf

@@ -17,7 +17,6 @@ conn %default
 
 conn home
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	[email protected]
 	leftfirewall=yes

testing/tests/ikev1/esp-ah-tunnel/hosts/moon/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
-	leftnexthop=%direct
 	auth=ah
 	ike=aes128-sha
 	esp=aes128-sha1

testing/tests/ikev1/esp-alg-des/hosts/carol/etc/ipsec.conf

@@ -13,9 +13,9 @@ conn %default
 	keyingtries=1
 	ike=3des-md5-modp1024!
 	esp=des-md5!
+
 conn home
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	[email protected]
 	right=PH_IP_MOON

testing/tests/ikev1/esp-alg-des/hosts/moon/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
-	leftnexthop=%direct
 	ike=3des-md5-modp1024!
 	esp=des-md5!
 

testing/tests/ikev1/esp-alg-null/hosts/carol/etc/ipsec.conf

@@ -13,9 +13,9 @@ conn %default
 	keyingtries=1
 	ike=aes-128-sha
 	esp=null-sha1!
+
 conn home
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	[email protected]
 	right=PH_IP_MOON

testing/tests/ikev1/esp-alg-null/hosts/moon/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
-	leftnexthop=%direct
 	ike=aes128-sha!
 	esp=null-sha1!
 

testing/tests/ikev1/esp-alg-strict-fail/hosts/carol/etc/ipsec.conf

@@ -13,9 +13,9 @@ conn %default
 	keyingtries=1
 	ike=3des-sha
 	esp=3des-sha1
+
 conn home
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	[email protected]
 	right=PH_IP_MOON

testing/tests/ikev1/esp-alg-strict-fail/hosts/moon/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
-	leftnexthop=%direct
 	ike=aes128-sha
 	esp=aes128-sha1!
 

testing/tests/ikev1/esp-alg-strict/hosts/carol/etc/ipsec.conf

@@ -13,9 +13,9 @@ conn %default
 	keyingtries=1
 	ike=3des-sha,aes-128-sha
 	esp=3des-sha1,aes-128-sha1
+
 conn home
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	[email protected]
 	right=PH_IP_MOON

testing/tests/ikev1/esp-alg-strict/hosts/moon/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
-	leftnexthop=%direct
 	ike=aes128-sha
 	esp=aes128-sha1!
 

testing/tests/ikev1/esp-alg-weak/hosts/carol/etc/ipsec.conf

@@ -13,9 +13,9 @@ conn %default
 	keyingtries=1
 	ike=3des-md5-modp1024!
 	esp=des-md5!
+
 conn home
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	[email protected]
 	right=PH_IP_MOON

testing/tests/ikev1/esp-alg-weak/hosts/moon/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
-	leftnexthop=%direct
 
 conn rw
 	left=PH_IP_MOON

testing/tests/ikev1/host2host-swapped/hosts/moon/etc/ipsec.conf

@@ -14,7 +14,6 @@ conn %default
 
 conn host-host
 	right=PH_IP_MOON
-	rightnexthop=%direct
 	rightcert=moonCert.pem
 	[email protected]
 	rightfirewall=yes

testing/tests/ikev1/host2host-swapped/hosts/sun/etc/ipsec.conf

@@ -15,7 +15,6 @@ conn %default
 
 conn host-host
 	right=PH_IP_SUN
-	rightnexthop=%direct
 	rightcert=sunCert.pem
 	rightfirewall=yes
 	[email protected]

testing/tests/ikev1/host2host-transport/hosts/moon/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
-	leftnexthop=%direct
 
 conn host-host
 	left=PH_IP_MOON

testing/tests/ikev1/host2host-transport/hosts/sun/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
-	leftnexthop=%direct
 
 conn host-host
 	left=PH_IP_SUN

testing/tests/ikev1/ike-alg-sha2_384/hosts/carol/etc/ipsec.conf

@@ -15,7 +15,6 @@ conn %default
 	esp=aes192-sha2_256!
 conn home
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	[email protected]
 	right=PH_IP_MOON

testing/tests/ikev1/ike-alg-sha2_384/hosts/moon/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
-	leftnexthop=%direct
 	ike=aes192-sha2_384-modp4096!
 	esp=aes192-sha2_256!
 

testing/tests/ikev1/ike-alg-sha2_512/hosts/carol/etc/ipsec.conf

@@ -15,7 +15,6 @@ conn %default
 	esp=aes256-sha2_256!
 conn home
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	[email protected]
 	right=PH_IP_MOON

testing/tests/ikev1/ike-alg-sha2_512/hosts/moon/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
-	leftnexthop=%direct
 	ike=aes256-sha2_512-modp8192!
 	esp=aes256-sha2_256!
 

testing/tests/ikev1/ike-alg-strict-fail/hosts/carol/etc/ipsec.conf

@@ -13,9 +13,9 @@ conn %default
 	keyingtries=1
 	ike=3des-sha
 	esp=3des-sha1
+
 conn home
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	[email protected]
 	right=PH_IP_MOON

testing/tests/ikev1/ike-alg-strict-fail/hosts/moon/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
-	leftnexthop=%direct
 	ike=aes128-sha!
 	esp=aes128-sha1
 

testing/tests/ikev1/ike-alg-strict/hosts/carol/etc/ipsec.conf

@@ -15,7 +15,6 @@ conn %default
 	esp=3des-sha1,aes-128-sha1
 conn home
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	[email protected]
 	right=PH_IP_MOON

testing/tests/ikev1/ike-alg-strict/hosts/moon/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
-	leftnexthop=%direct
 	ike=aes128-sha!
 	esp=aes128-sha1
 

testing/tests/ikev1/mode-config-push/hosts/carol/etc/ipsec.conf

@@ -15,7 +15,6 @@ conn %default
 conn home
 	left=PH_IP_CAROL
 	leftsourceip=%modeconfig
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	[email protected]
 	leftfirewall=yes

testing/tests/ikev1/mode-config-push/hosts/dave/etc/ipsec.conf

@@ -15,7 +15,6 @@ conn %default
 conn home
 	left=PH_IP_DAVE
 	leftsourceip=%modeconfig
-	leftnexthop=%direct
 	leftcert=daveCert.pem
 	[email protected]
 	leftfirewall=yes

testing/tests/ikev1/mode-config-push/hosts/moon/etc/ipsec.conf

@@ -15,7 +15,6 @@ conn %default
 	left=PH_IP_MOON
 	leftsubnet=10.1.0.0/16
 	leftsourceip=PH_IP_MOON1
-	leftnexthop=%direct
 	leftcert=moonCert.pem
 	[email protected]
 	leftfirewall=yes

testing/tests/ikev1/mode-config-swapped/hosts/carol/etc/ipsec.conf

@@ -15,7 +15,6 @@ conn %default
 conn home
 	right=PH_IP_CAROL
 	rightsourceip=%modeconfig
-	rightnexthop=%direct
 	rightcert=carolCert.pem
 	[email protected]
 	rightfirewall=yes

testing/tests/ikev1/mode-config-swapped/hosts/dave/etc/ipsec.conf

@@ -15,7 +15,6 @@ conn %default
 conn home
 	right=PH_IP_DAVE
 	rightsourceip=%modeconfig
-	rightnexthop=%direct
 	rightcert=daveCert.pem
 	[email protected]
 	rightfirewall=yes

testing/tests/ikev1/mode-config-swapped/hosts/moon/etc/ipsec.conf

@@ -14,7 +14,6 @@ conn %default
 	right=PH_IP_MOON
 	rightsubnet=10.1.0.0/16
 	rightsourceip=PH_IP_MOON1
-	rightnexthop=%direct
 	rightcert=moonCert.pem
 	[email protected]
 	rightfirewall=yes

testing/tests/ikev1/mode-config/hosts/carol/etc/ipsec.conf

@@ -15,7 +15,6 @@ conn %default
 conn home
 	left=PH_IP_CAROL
 	leftsourceip=%modeconfig
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	[email protected]
 	leftfirewall=yes

testing/tests/ikev1/mode-config/hosts/dave/etc/ipsec.conf

@@ -15,7 +15,6 @@ conn %default
 conn home
 	left=PH_IP_DAVE
 	leftsourceip=%modeconfig
-	leftnexthop=%direct
 	leftcert=daveCert.pem
 	[email protected]
 	leftfirewall=yes

testing/tests/ikev1/mode-config/hosts/moon/etc/ipsec.conf

@@ -14,7 +14,6 @@ conn %default
 	left=PH_IP_MOON
 	leftsubnet=10.1.0.0/16
 	leftsourceip=PH_IP_MOON1
-	leftnexthop=%direct
 	leftcert=moonCert.pem
 	[email protected]
 	leftfirewall=yes

testing/tests/ikev1/multi-level-ca-ldap/hosts/carol/etc/ipsec.conf

@@ -17,7 +17,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	right=PH_IP_MOON
 	[email protected]

testing/tests/ikev1/multi-level-ca-ldap/hosts/dave/etc/ipsec.conf

@@ -17,7 +17,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_DAVE
-	leftnexthop=%direct
 	leftcert=daveCert.pem
 	right=PH_IP_MOON
 	[email protected]

testing/tests/ikev1/multi-level-ca-ldap/hosts/moon/etc/ipsec.conf

@@ -27,7 +27,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_MOON
-	leftnexthop=%direct
 	leftcert=moonCert.pem
 	[email protected]
 	leftfirewall=yes

testing/tests/ikev1/multi-level-ca-loop/hosts/carol/etc/ipsec.conf

@@ -12,7 +12,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	right=PH_IP_MOON
 	[email protected]

testing/tests/ikev1/multi-level-ca-loop/hosts/moon/etc/ipsec.conf

@@ -12,7 +12,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_MOON
-	leftnexthop=%direct
 	leftcert=moonCert.pem
 	[email protected]
 

testing/tests/ikev1/multi-level-ca-revoked/hosts/carol/etc/ipsec.conf

@@ -12,7 +12,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	[email protected]
 

testing/tests/ikev1/multi-level-ca-revoked/hosts/moon/etc/ipsec.conf

@@ -17,7 +17,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_MOON
-	leftnexthop=%direct
 	leftcert=moonCert.pem
 	[email protected]
 

testing/tests/ikev1/multi-level-ca-strict/hosts/carol/etc/ipsec.conf

@@ -12,7 +12,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	right=PH_IP_MOON
 	[email protected]

testing/tests/ikev1/multi-level-ca-strict/hosts/dave/etc/ipsec.conf

@@ -12,7 +12,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_DAVE
-	leftnexthop=%direct
 	leftcert=daveCert.pem
 	right=PH_IP_MOON
 	[email protected]

testing/tests/ikev1/multi-level-ca-strict/hosts/moon/etc/ipsec.conf

@@ -17,7 +17,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_MOON
-	leftnexthop=%direct
 	leftcert=moonCert.pem
 	[email protected]
 

testing/tests/ikev1/multi-level-ca/hosts/carol/etc/ipsec.conf

@@ -12,7 +12,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	leftsendcert=ifasked
 	right=PH_IP_MOON

testing/tests/ikev1/multi-level-ca/hosts/dave/etc/ipsec.conf

@@ -12,7 +12,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_DAVE
-	leftnexthop=%direct
 	leftcert=daveCert.pem
 	leftsendcert=ifasked
 	right=PH_IP_MOON

testing/tests/ikev1/multi-level-ca/hosts/moon/etc/ipsec.conf

@@ -17,7 +17,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_MOON
-	leftnexthop=%direct
 	leftcert=moonCert.pem
 	leftsendcert=ifasked
 	[email protected]

testing/tests/ikev1/nat-before-esp/hosts/moon/etc/ipsec.conf

@@ -14,7 +14,6 @@ conn %default
 
 conn host-net
 	left=192.168.0.1
-	leftnexthop=%direct
 	leftcert=moonCert.pem
 	[email protected]
 	leftfirewall=yes

testing/tests/ikev1/nat-two-rw-psk/hosts/sun/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	authby=secret
-	leftnexthop=%direct
 	
 conn nat-t
 	left=PH_IP_SUN

testing/tests/ikev1/net2net-pgp/hosts/moon/etc/ipsec.conf

@@ -10,7 +10,6 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
-	leftnexthop=%direct
 	
 conn net-net
 	left=PH_IP_MOON

testing/tests/ikev1/net2net-pgp/hosts/sun/etc/ipsec.conf

@@ -10,7 +10,6 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
-	leftnexthop=%direct
 	
 conn net-net
 	left=PH_IP_SUN

testing/tests/ikev1/net2net-psk-fail/hosts/moon/etc/ipsec.conf

@@ -10,7 +10,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	authby=secret
-	leftnexthop=%direct
 	
 conn net-net
 	left=PH_IP_MOON

testing/tests/ikev1/net2net-psk-fail/hosts/sun/etc/ipsec.conf

@@ -10,7 +10,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	authby=secret
-	leftnexthop=%direct
 	
 conn net-net
 	left=PH_IP_SUN

testing/tests/ikev1/net2net-psk/hosts/moon/etc/ipsec.conf

@@ -10,7 +10,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	authby=secret
-	leftnexthop=%direct
 	
 conn net-net
 	left=PH_IP_MOON

testing/tests/ikev1/net2net-psk/hosts/sun/etc/ipsec.conf

@@ -10,7 +10,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	authby=secret
-	leftnexthop=%direct
 	
 conn net-net
 	left=PH_IP_SUN

testing/tests/ikev1/net2net-route/hosts/moon/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
-	leftnexthop=%direct
 
 conn net-net
 	left=PH_IP_MOON

testing/tests/ikev1/net2net-rsa/hosts/moon/etc/ipsec.conf

@@ -9,7 +9,6 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
-	leftnexthop=%direct
 	
 conn net-net
 	left=PH_IP_MOON

testing/tests/ikev1/net2net-rsa/hosts/sun/etc/ipsec.conf

@@ -9,7 +9,6 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
-	leftnexthop=%direct
 	
 conn net-net
 	left=PH_IP_SUN

testing/tests/ikev1/net2net-start/hosts/moon/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
-	leftnexthop=%direct
 
 conn net-net
 	left=PH_IP_MOON

testing/tests/ikev1/ocsp-revoked/hosts/carol/etc/ipsec.conf

@@ -17,7 +17,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolRevokedCert.pem
 	[email protected]
 

testing/tests/ikev1/ocsp-revoked/hosts/moon/etc/ipsec.conf

@@ -17,7 +17,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_MOON
-	leftnexthop=%direct
 	leftcert=moonCert.pem
 	[email protected]
 

testing/tests/ikev1/ocsp-strict/hosts/carol/etc/ipsec.conf

@@ -17,7 +17,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	[email protected]
 

testing/tests/ikev1/ocsp-strict/hosts/moon/etc/ipsec.conf

@@ -17,7 +17,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_MOON
-	leftnexthop=%direct
 	leftcert=moonCert.pem
 	[email protected]
 

testing/tests/ikev1/protoport-dual/hosts/carol/etc/ipsec.conf

@@ -12,7 +12,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	[email protected]
 	leftfirewall=yes

testing/tests/ikev1/protoport-dual/hosts/moon/etc/ipsec.conf

@@ -12,7 +12,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_MOON
-	leftnexthop=%direct
 	leftcert=moonCert.pem
 	[email protected]
 	leftfirewall=yes

testing/tests/ikev1/protoport-pass/hosts/carol/etc/ipsec.conf

@@ -14,7 +14,6 @@ conn %default
 
 conn home-icmp
 	left=PH_IP_CAROL
-	leftnexthop=%direct
         [email protected]
 	leftcert=carolCert.pem
 	leftprotoport=icmp

testing/tests/ikev1/protoport-pass/hosts/moon/etc/ipsec.conf

@@ -14,7 +14,6 @@ conn %default
 
 conn rw-icmp
 	left=PH_IP_MOON
-	leftnexthop=%direct
 	leftsubnet=10.1.0.0/16
 	leftprotoport=icmp
 	[email protected]

testing/tests/ikev1/protoport-route/hosts/carol/etc/ipsec.conf

@@ -12,7 +12,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=PH_IP_CAROL
-	leftnexthop=%direct
 	leftcert=carolCert.pem
 	[email protected]
 	leftfirewall=yes