X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/2ddf1bced884ee587a205bfc156607e52e5a8dec..b95726afbe7dd4e338ce26f65e773965988e1c36:/l2tpns.c?ds=sidebyside

diff --git a/l2tpns.c b/l2tpns.c
index d6fa99e..6d1bb54 100644
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -4,7 +4,7 @@
 // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
 // vim: sw=8 ts=8
 
-char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.142 2005/09/19 02:39:57 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.144 2005/10/11 09:04:53 bodea Exp $";
 
 #include <arpa/inet.h>
 #include <assert.h>
@@ -162,6 +162,7 @@ static char *plugin_functions[] = {
 	"plugin_control",
 	"plugin_radius_response",
 	"plugin_radius_reset",
+	"plugin_radius_account",
 	"plugin_become_master",
 	"plugin_new_session_master",
 };
@@ -961,7 +962,7 @@ void tunnelsend(uint8_t * buf, uint16_t l, tunnelidt t)
 	{
 		tunnel[t].last = time_now; // control message sent
 		tunnel[t].retry = backoff(tunnel[t].try); // when to resend
-		if (tunnel[t].try > 1)
+		if (tunnel[t].try)
 		{
 			STAT(tunnel_retries);
 			LOG(3, 0, t, "Control message resend try %d\n", tunnel[t].try);
@@ -2745,7 +2746,7 @@ static void regular_cleanups(double period)
 			}
 		}
 		// Send hello
-		if (tunnel[t].state == TUNNELOPEN && (time_now - tunnel[t].lastrec) > 60)
+		if (tunnel[t].state == TUNNELOPEN && !tunnel[t].controlc && (time_now - tunnel[t].lastrec) > 60)
 		{
 			controlt *c = controlnew(6); // sending HELLO
 			controladd(c, 0, t); // send the message