Update copyright information.

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index e834f92..1682705 100644 (file)
--- 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,
 /*
     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
 
     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


@@ -429,12 +429,7 @@ int main_loop(void)
 
                if(sigalrm) {
                        logger(LOG_INFO, _("Flushing event queue"));
 
                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;
                }
 
                        sigalrm = false;
                }
 


@@ -463,7 +458,8 @@ int main_loop(void)
                                
                                if(c->outgoing) {
                                        free(c->outgoing->name);
                                
                                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;
                                }
                                        free(c->outgoing);
                                        c->outgoing = NULL;
                                }