X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=1682705da74153241b3a96571ab5f8b6f37bdf54;hp=e2e2833c80a71af8c448861f92ae79e0e3274865;hb=e9576632dc4b780b867044269d06cc50f76d8c05;hpb=9fa27097dd82e20299f5277ecb4efffb4a99669c

diff --git a/src/net.c b/src/net.c
index e2e2833c..1682705d 100644
--- a/src/net.c
+++ b/src/net.c
@@ -1,7 +1,7 @@
 /*
     net.c -- most of the network code
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2007 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -354,13 +354,15 @@ int main_loop(void)
 	fd_set readset, writeset;
 	struct timeval tv;
 	int r, maxfd;
-	time_t last_ping_check, last_config_check;
+	time_t last_ping_check, last_config_check, last_graph_dump;
 	event_t *event;
 
 	cp();
 
 	last_ping_check = now;
 	last_config_check = now;
+	last_graph_dump = now;
+	
 	srand(now);
 
 	running = true;
@@ -422,17 +424,12 @@ int main_loop(void)
 
 		while((event = get_expired_event())) {
 			event->handler(event->data);
-			free(event);
+			free_event(event);
 		}
 
 		if(sigalrm) {
 			logger(LOG_INFO, _("Flushing event queue"));
-
-			while(event_tree->head) {
-				event = event_tree->head->data;
-				event->handler(event->data);
-				event_del(event);
-			}
+			flush_events();
 			sigalrm = false;
 		}
 
@@ -461,7 +458,8 @@ int main_loop(void)
 				
 				if(c->outgoing) {
 					free(c->outgoing->name);
-					freeaddrinfo(c->outgoing->ai);
+					if(c->outgoing->ai)
+						freeaddrinfo(c->outgoing->ai);
 					free(c->outgoing);
 					c->outgoing = NULL;
 				}
@@ -478,6 +476,13 @@ int main_loop(void)
 			
 			try_outgoing_connections();
 		}
+		
+		/* Dump graph if wanted every 60 seconds*/
+
+		if(last_graph_dump + 60 < now) {
+			dump_graph();
+			last_graph_dump = now;
+		}
 	}
 
 	return 0;