X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_packet.c;h=ed49b0b2add2020cc0e62ec414e009ee72b04e70;hp=8b49b25a00cd60af832ef7c922aa9f6150ffd625;hb=0077cfaae112b63d6af6aa1e5d079cebdde84b74;hpb=35399784b695c9ac692beba7be7930ee9f24412f

diff --git a/src/net_packet.c b/src/net_packet.c
index 8b49b25a..ed49b0b2 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -1,7 +1,7 @@
 /*
     net_packet.c -- Handles in- and outgoing VPN packets
-    Copyright (C) 1998-2003 Ivo Timmermans <ivo@o2w.nl>,
-                  2000-2003 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1998-2004 Ivo Timmermans <ivo@tinc-vpn.org>,
+                  2000-2004 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
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net_packet.c,v 1.1.2.47 2003/12/22 11:04:16 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -35,6 +35,7 @@
 #include "conf.h"
 #include "connection.h"
 #include "device.h"
+#include "ethernet.h"
 #include "event.h"
 #include "graph.h"
 #include "list.h"
@@ -230,17 +231,21 @@ static void receive_udppacket(node_t *n, vpn_packet_t *inpkt)
 			
 			memset(n->late, 0, sizeof(n->late));
 		} else if (inpkt->seqno <= n->received_seqno) {
-			if(inpkt->seqno <= n->received_seqno - sizeof(n->late) * 8 || !(n->late[(inpkt->seqno / 8) % sizeof(n->late)] & (1 << inpkt->seqno % 8))) {
+			if((n->received_seqno >= sizeof(n->late) * 8 && inpkt->seqno <= n->received_seqno - sizeof(n->late) * 8) || !(n->late[(inpkt->seqno / 8) % sizeof(n->late)] & (1 << inpkt->seqno % 8))) {
 				logger(LOG_WARNING, _("Got late or replayed packet from %s (%s), seqno %d, last received %d"),
 					   n->name, n->hostname, inpkt->seqno, n->received_seqno);
-			} else
-				for(i = n->received_seqno + 1; i < inpkt->seqno; i++)
-					n->late[(inpkt->seqno / 8) % sizeof(n->late)] |= 1 << i % 8;
+				return;
+			}
+		} else {
+			for(i = n->received_seqno + 1; i < inpkt->seqno; i++)
+				n->late[(i / 8) % sizeof(n->late)] |= 1 << i % 8;
 		}
 	}
 	
-	n->received_seqno = inpkt->seqno;
-	n->late[(n->received_seqno / 8) % sizeof(n->late)] &= ~(1 << n->received_seqno % 8);
+	n->late[(inpkt->seqno / 8) % sizeof(n->late)] &= ~(1 << inpkt->seqno % 8);
+
+	if(inpkt->seqno > n->received_seqno)
+		n->received_seqno = inpkt->seqno;
 			
 	if(n->received_seqno > MAX_SEQNO)
 		keyexpires = 0;
@@ -352,7 +357,7 @@ static void send_udppacket(node_t *n, vpn_packet_t *inpkt)
 				|| !EVP_EncryptFinal_ex(&n->packet_ctx, (char *) &outpkt->seqno + outlen, &outpad)) {
 			ifdebug(TRAFFIC) logger(LOG_ERR, _("Error while encrypting packet to %s (%s): %s"),
 						n->name, n->hostname, ERR_error_string(ERR_get_error(), NULL));
-			return;
+			goto end;
 		}
 
 		outpkt->len = outlen + outpad;
@@ -389,16 +394,16 @@ static void send_udppacket(node_t *n, vpn_packet_t *inpkt)
 #endif
 
 	if((sendto(listen_socket[sock].udp, (char *) &inpkt->seqno, inpkt->len, 0, &(n->address.sa), SALEN(n->address.sa))) < 0) {
-		logger(LOG_ERR, _("Error sending packet to %s (%s): %s"), n->name, n->hostname, strerror(errno));
 		if(errno == EMSGSIZE) {
 			if(n->maxmtu >= origlen)
 				n->maxmtu = origlen - 1;
 			if(n->mtu >= origlen)
 				n->mtu = origlen - 1;
-		}
-		return;
+		} else
+			logger(LOG_ERR, _("Error sending packet to %s (%s): %s"), n->name, n->hostname, strerror(errno));
 	}
 
+end:
 	inpkt->len = origlen;
 }
 
@@ -412,6 +417,8 @@ void send_packet(const node_t *n, vpn_packet_t *packet)
 	cp();
 
 	if(n == myself) {
+		if(overwrite_mac)
+			 memcpy(packet->data, mymac.x, ETH_ALEN);
 		write_packet(packet);
 		return;
 	}
@@ -450,6 +457,12 @@ void broadcast_packet(const node_t *from, vpn_packet_t *packet)
 	ifdebug(TRAFFIC) logger(LOG_INFO, _("Broadcasting packet of %d bytes from %s (%s)"),
 			   packet->len, from->name, from->hostname);
 
+	if(from != myself) {
+		if(overwrite_mac)
+			 memcpy(packet->data, mymac.x, ETH_ALEN);
+		write_packet(packet);
+	}
+
 	for(node = connection_tree->head; node; node = node->next) {
 		c = node->data;