Allow linking with multiple device drivers.
[oweals/tinc.git] / src / net_packet.c
index 062523e50417f7c6e7c81bdab9de04db15e24204..54deb26c70ab66c1a2e755225ba4f053a93ce733 100644 (file)
@@ -43,7 +43,6 @@
 #include "ethernet.h"
 #include "event.h"
 #include "graph.h"
-#include "list.h"
 #include "logger.h"
 #include "net.h"
 #include "netutl.h"
@@ -404,7 +403,7 @@ static void send_udppacket(node_t *n, vpn_packet_t *origpkt) {
                                   "No valid key known yet for %s (%s), forwarding via TCP",
                                   n->name, n->hostname);
 
-               if(n->last_req_key + 10 < now) {
+               if(n->last_req_key + 10 <= now) {
                        send_req_key(n);
                        n->last_req_key = now;
                }
@@ -519,7 +518,7 @@ void send_packet(const node_t *n, vpn_packet_t *packet) {
        if(n == myself) {
                if(overwrite_mac)
                         memcpy(packet->data, mymac.x, ETH_ALEN);
-               write_packet(packet);
+               devops.write(packet);
                return;
        }