X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_packet.c;h=255453e9b5cd23ecd7c62599b78bbf495575db46;hp=ae5a8402a7af159ad3873b877854c2b286a0c485;hb=af86a3226ea42375644b3f99c182c778d327de1e;hpb=27c304940a5dbe83fb0f655c5c43150bafed3b63

diff --git a/src/net_packet.c b/src/net_packet.c
index ae5a8402..255453e9 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -54,7 +54,6 @@
 
 int keylifetime = 0;
 int keyexpires = 0;
-bool strictsource = true;
 EVP_CIPHER_CTX packet_ctx;
 static char lzo_wrkmem[LZO1X_999_MEM_COMPRESS > LZO1X_1_MEM_COMPRESS ? LZO1X_999_MEM_COMPRESS : LZO1X_1_MEM_COMPRESS];
 
@@ -168,25 +167,6 @@ static void receive_packet(node_t *n, vpn_packet_t *packet)
 	route(n, packet);
 }
 
-static bool authenticate_udppacket(node_t *n, vpn_packet_t *inpkt) {
-	char hmac[EVP_MAX_MD_SIZE];
-
-	if(inpkt->len < sizeof(inpkt->seqno) + (myself->digest ? myself->maclength : 0))
-		return false;
-
-	/* Check the message authentication code */
-
-	if(myself->digest && myself->maclength) {
-		HMAC(myself->digest, myself->key, myself->keylength,
-			 (char *) &inpkt->seqno, inpkt->len - myself->maclength, hmac, NULL);
-
-		if(memcmp(hmac, (char *) &inpkt->seqno + inpkt->len - myself->maclength, myself->maclength))
-			return false;
-	}
-
-	return true;
-}
-
 static void receive_udppacket(node_t *n, vpn_packet_t *inpkt)
 {
 	vpn_packet_t pkt1, pkt2;
@@ -194,17 +174,32 @@ static void receive_udppacket(node_t *n, vpn_packet_t *inpkt)
 	int nextpkt = 0;
 	vpn_packet_t *outpkt = pkt[0];
 	int outlen, outpad;
+	char hmac[EVP_MAX_MD_SIZE];
 	int i;
 
 	cp();
 
-	if(!authenticate_udppacket(n, inpkt)) {
-		ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Got unauthenticated packet from %s (%s)"),
-					   n->name, n->hostname);
+	/* Check packet length */
+
+	if(inpkt->len < sizeof(inpkt->seqno) + myself->maclength) {
+		ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Got too short packet from %s (%s)"),
+					n->name, n->hostname);
 		return;
 	}
 
-	inpkt->len -= myself->digest ? myself->maclength : 0;
+	/* Check the message authentication code */
+
+	if(myself->digest && myself->maclength) {
+		inpkt->len -= myself->maclength;
+		HMAC(myself->digest, myself->key, myself->keylength,
+			 (char *) &inpkt->seqno, inpkt->len, hmac, NULL);
+
+		if(memcmp(hmac, (char *) &inpkt->seqno + inpkt->len, myself->maclength)) {
+			ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Got unauthenticated packet from %s (%s)"),
+					   n->name, n->hostname);
+			return;
+		}
+	}
 
 	/* Decrypt the packet */
 
@@ -488,7 +483,6 @@ void handle_incoming_vpn_data(int sock)
 	sockaddr_t from;
 	socklen_t fromlen = sizeof(from);
 	node_t *n;
-	static time_t lasttime = 0;
 
 	cp();
 
@@ -503,25 +497,10 @@ void handle_incoming_vpn_data(int sock)
 
 	n = lookup_node_udp(&from);
 
-	if(!n && !strictsource && myself->digest && myself->maclength && lasttime != now) {
-		avl_node_t *node;
-
-		lasttime = now;
-
-		for(node = node_tree->head; node; node = node->next) {
-			n = node->data;
-
-			if(authenticate_udppacket(n, &pkt)) {
-				update_node_address(n, &from);
-				logger(LOG_DEBUG, _("Updated address of node %s to %s"), n->name, n->hostname);
-				break;
-			}
-		}
-	}
-
 	if(!n) {
 		hostname = sockaddr2hostname(&from);
-		logger(LOG_WARNING, _("Received UDP packet from unknown source %s"), hostname);
+		logger(LOG_WARNING, _("Received UDP packet from unknown source %s"),
+			   hostname);
 		free(hostname);
 		return;
 	}