X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/05ea15956a947b616fffde58db87988b039ca077..b95726afbe7dd4e338ce26f65e773965988e1c36:/l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index b94926c..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.141 2005/09/19 00:29:12 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
@@ -3411,18 +3412,19 @@ static void mainloop(void)
 
 		if (time_changed)
 		{
-			double Mbps = ((1024.0 / 1024.0) * 8) / time_changed;
-			time_changed = 0;
+			double Mbps = 1024.0 * 1024.0 / 8 * time_changed;
 
 			// Log current traffic stats
 			snprintf(config->bandwidth, sizeof(config->bandwidth),
 				"UDP-ETH:%1.0f/%1.0f  ETH-UDP:%1.0f/%1.0f  TOTAL:%0.1f   IN:%u OUT:%u",
 				(udp_rx / Mbps), (eth_tx / Mbps), (eth_rx / Mbps), (udp_tx / Mbps),
-				((udp_tx + udp_rx + eth_tx + eth_rx) / Mbps), udp_rx_pkt, eth_rx_pkt);
+				((udp_tx + udp_rx + eth_tx + eth_rx) / Mbps),
+				udp_rx_pkt / time_changed, eth_rx_pkt / time_changed);
 		 
 			udp_tx = udp_rx = 0;
 			udp_rx_pkt = eth_rx_pkt = 0;
 			eth_tx = eth_rx = 0;
+			time_changed = 0;
 		 
 			if (config->dump_speed)
 				printf("%s\n", config->bandwidth);