X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=ipif%2Fudptunnel-vpn-defaults;h=77adf168ea76870b82dc3b4ec5c1767e082959dd;hb=0f7aad33b43b74605605cae96d8298e9aeb201c1;hp=add96dac8e1739ae98018ad6bb6b5ad1f1fd9a1c;hpb=2e082dfed76851117cafd488388a010cac25df09;p=userv-utils.git

diff --git a/ipif/udptunnel-vpn-defaults b/ipif/udptunnel-vpn-defaults
index add96da..77adf16 100644
--- a/ipif/udptunnel-vpn-defaults
+++ b/ipif/udptunnel-vpn-defaults
@@ -1,8 +1,16 @@
 m4_dnl udptunnel-vpn-defaults: default settings for udptunnel-reconf
 
+m4_dnl This file is part of ipif, part of userv-utils
+m4_dnl
+m4_dnl Copyright 1996-2013 Ian Jackson <ijackson@chiark.greenend.org.uk>
+m4_dnl Copyright 1998 David Damerell <damerell@chiark.greenend.org.uk>
+m4_dnl Copyright 1999,2003
+m4_dnl    Chancellor Masters and Scholars of the University of Cambridge
+m4_dnl Copyright 2010 Tony Finch <fanf@dotat.at>
+m4_dnl
 m4_dnl This is free software; you can redistribute it and/or modify it
 m4_dnl under the terms of the GNU General Public License as published by
-m4_dnl the Free Software Foundation; either version 2 of the License, or
+m4_dnl the Free Software Foundation; either version 3 of the License, or
 m4_dnl (at your option) any later version.
 m4_dnl
 m4_dnl This program is distributed in the hope that it will be useful, but
@@ -11,14 +19,12 @@ m4_dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 m4_dnl General Public License for more details.
 m4_dnl
 m4_dnl You should have received a copy of the GNU General Public License
-m4_dnl along with userv-utils; if not, write to the Free Software
-m4_dnl Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-m4_dnl
-m4_dnl $Id$
+m4_dnl along with userv-utils; if not, see http://www.gnu.org/licenses/.
 
 SET(	lcommand,	[udptunnel])
+SET(	clock_maxskew,	45)
 SET( crypto,
-	[-e nonce -e timestamp/10/30 -e pkcs5/8 \
+	[-e nonce -e timestamp/V_clock_maxskew/V_clock_maxskew -e pkcs5/8 \
 	-e blowfish-cbcmac/128 -e blowfish-cbc/128])
 
 SET(	lpublic,	[`hostname`])
@@ -28,7 +34,8 @@ SET(	rport,		[Command])
 m4_dnl	lend		-- usually set in global
 m4_dnl	rend		-- usually set in sites
 SET(	mtu,		[1000])
-SET(	proto,		[cslip])
+SET(	proto,		[slip])
+SET(	to_restart,	[10])
 SET(	to_poll,	[30])
 SET(	to_quit,	[130])
 SET(	to_report,	[1800])
@@ -48,7 +55,8 @@ SET( ssh,
 	[ssh	V_sshstdopts \
 		V_sshprotoka V_sshverbose \
 		V_sshopts])
-
+SET( sshinvoke,		[V_ssh V_ruser@V_sshdest])
+		
 SET(	sshdest,	[V_rpublic])
 
 SET(	sites,		[sites])
@@ -74,7 +82,7 @@ SET(	syslog_priority,	info)
 SET(	inittab_runlevels,	2345)
 SET(	inittab_pfx,		[])
 SET(	inittab_sfx,
- [2>&1 | logger -p V_syslog_facility.V_syslog_priority -t tunnel-V_site])
+ [</dev/null 2>&1 | logger -p V_syslog_facility.V_syslog_priority -t tunnel-V_site])
 SET(	inittab_command,[V_inittab_pfx V_invoke_file V_inittab_sfx])
 SET(	inittab_line, 	[V_inittab_runlevels:respawn:V_inittab_command])
 
@@ -82,9 +90,13 @@ SET( invoke_body,
 [set -e
 V_invoke_hook
 echo "STARTING TUNNEL `date`" >&2
+set +e
 V_command
 rc=$?
+set -e
 echo "TUNNEL CLOSED rc=$rc" >&2
+sleep V_to_restart
+echo "TUNNEL MAYRESTART" >&2
 exit $rc
 ])
 
@@ -99,7 +111,5 @@ SET(	command,
 	V_timeouts \
 	V_rnets \
 	V_lnets \
-	V_ssh \
-		V_ruser@V_sshdest \
-		V_rcommand
+	V_sshinvoke V_rcommand
 	])