@@ -1,3 +1,9 @@

+userv-utils (0.2.2) unstable; urgency=low
+
+  * udptunnel-reconf default script pauses for 10s between restarts.
+
+ --
+
 userv-utils (0.2.1) unstable; urgency=low

   * New udptunnel-reconf program for generating invoke scripts, inittab

diff --git a/changelog b/changelog
index 5af63142ff229e7d090c4feccb8715a928429aeb..342861d7fb1b2c31450e67d9dd36037aab550750 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+userv-utils (0.2.2) unstable; urgency=low
+
+  * udptunnel-reconf default script pauses for 10s between restarts.
+
+ --
+

 userv-utils (0.2.1) unstable; urgency=low
 
   * New udptunnel-reconf program for generating invoke scripts, inittab
 userv-utils (0.2.1) unstable; urgency=low
 
   * New udptunnel-reconf program for generating invoke scripts, inittab

diff --git a/ipif/udptunnel-vpn-defaults b/ipif/udptunnel-vpn-defaults
index 38512ae51e8da3397096cb05863dc9ee98b19fae..4b7477294696ca6268ded4a7287f928580c81c63 100644 (file)
--- a/ipif/udptunnel-vpn-defaults
+++ b/ipif/udptunnel-vpn-defaults
@@ -14,7 +14,7 @@ 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 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: udptunnel-vpn-defaults,v 1.2 2000/12/11 02:41:27 ian Exp $
+m4_dnl $Id: udptunnel-vpn-defaults,v 1.3 2001/02/20 02:21:55 ian Exp $

 
 SET(   lcommand,       [udptunnel])
 SET( crypto,
 
 SET(   lcommand,       [udptunnel])
 SET( crypto,


@@ -29,6 +29,7 @@ m4_dnl        lend            -- usually set in global
 m4_dnl rend            -- usually set in sites
 SET(   mtu,            [1000])
 SET(   proto,          [cslip])
 m4_dnl rend            -- usually set in sites
 SET(   mtu,            [1000])
 SET(   proto,          [cslip])

+SET(   to_restart,     [10])

 SET(   to_poll,        [30])
 SET(   to_quit,        [130])
 SET(   to_report,      [1800])
 SET(   to_poll,        [30])
 SET(   to_quit,        [130])
 SET(   to_report,      [1800])


@@ -82,9 +83,13 @@ SET( invoke_body,
 [set -e
 V_invoke_hook
 echo "STARTING TUNNEL `date`" >&2
 [set -e
 V_invoke_hook
 echo "STARTING TUNNEL `date`" >&2

+set +e

 V_command
 rc=$?
 V_command
 rc=$?

+set -e

 echo "TUNNEL CLOSED rc=$rc" >&2
 echo "TUNNEL CLOSED rc=$rc" >&2

+sleep V_to_restart
+echo "TUNNEL MAYRESTART" >&2

 exit $rc
 ])
 
 exit $rc
 ])