Use a simple Random Early Drop algorithm in send_tcppacket().

[oweals/tinc.git] / src / net.c

diff --git a/src/net.c b/src/net.c
index 1682705da74153241b3a96571ab5f8b6f37bdf54..0cdc72cc5ad8f150ad6520f20ef06d1847850098 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,
-                  2000-2007 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2009 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
@@ -295,8 +295,10 @@ static void check_network_activity(fd_set * readset, fd_set * writeset)
 
        /* check input from kernel */
        if(FD_ISSET(device_fd, readset)) {
-               if(read_packet(&packet))
+               if(read_packet(&packet)) {
+                       packet.priority = 0;
                        route(myself, &packet);
+               }
        }
 
        /* check meta connections */
@@ -364,6 +366,7 @@ int main_loop(void)
        last_graph_dump = now;
        
        srand(now);
+       srand48(now);
 
        running = true;
 
@@ -421,18 +424,17 @@ int main_loop(void)
                        }
                }
 
+               if(sigalrm) {
+                       logger(LOG_INFO, _("Flushing event queue"));
+                       expire_events();
+                       sigalrm = false;
+               }
 
                while((event = get_expired_event())) {
                        event->handler(event->data);
                        free_event(event);
                }
 
-               if(sigalrm) {
-                       logger(LOG_INFO, _("Flushing event queue"));
-                       flush_events();
-                       sigalrm = false;
-               }
-
                if(sighup) {
                        connection_t *c;
                        avl_node_t *node;
@@ -456,14 +458,6 @@ int main_loop(void)
                        for(node = connection_tree->head; node; node = node->next) {
                                c = node->data;
                                
-                               if(c->outgoing) {
-                                       free(c->outgoing->name);
-                                       if(c->outgoing->ai)
-                                               freeaddrinfo(c->outgoing->ai);
-                                       free(c->outgoing);
-                                       c->outgoing = NULL;
-                               }
-                               
                                asprintf(&fname, "%s/hosts/%s", confbase, c->name);
                                if(stat(fname, &s) || s.st_mtime > last_config_check)
                                        terminate_connection(c, c->status.active);