X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_packet.c;h=875a0832bf88cf0fc37a0dd4ce01775faf5b8439;hb=5d4336e5429b88dcc53e80c00412e76a5269b384;hp=1af5026adfa6bc55074ef6fa4f46882049ac8c28;hpb=2bda2aa8855ff3ae42aba7aa86e1d7ff2b7a3b34;p=tinc

diff --git a/src/net_packet.c b/src/net_packet.c
index 1af5026a..875a0832 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -45,7 +45,6 @@
 #include "device.h"
 #include "ethernet.h"
 #include "graph.h"
-#include "list.h"
 #include "logger.h"
 #include "net.h"
 #include "netutl.h"
@@ -357,7 +356,7 @@ static void receive_udppacket(node_t *n, vpn_packet_t *inpkt) {
 		receive_packet(n, inpkt);
 }
 
-void receive_tcppacket(connection_t *c, char *buffer, int len) {
+void receive_tcppacket(connection_t *c, const char *buffer, int len) {
 	vpn_packet_t outpkt;
 
 	outpkt.len = len;
@@ -398,7 +397,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;
 		}
@@ -571,11 +570,6 @@ static node_t *try_harder(const sockaddr_t *from, const vpn_packet_t *pkt) {
 	static time_t last_hard_try = 0;
 	time_t now = time(NULL);
 
-	if(last_hard_try == now)
-		return NULL;
-	else
-		last_hard_try = now;
-
 	for(node = edge_weight_tree->head; node; node = node->next) {
 		e = node->data;