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

diff --git a/src/net_packet.c b/src/net_packet.c
index 8b49b25a..255453e9 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -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: net_packet.c,v 1.1.2.49 2003/12/27 16:32:52 guus Exp $
 */
 
 #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"
@@ -352,7 +353,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 +390,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 +413,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;
 	}