Marking potential late packets was in the wrong place.

[tinc] / src / net_packet.c

diff --git a/src/net_packet.c b/src/net_packet.c
index d2e9aa8..2a3e5f2 100644 (file)
--- 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.46 2003/12/20 21:09:33 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"
@@ -47,6 +48,10 @@
 #include "utils.h"
 #include "xalloc.h"
 
+#ifdef WSAEMSGSIZE
+#define EMSGSIZE WSAEMSGSIZE
+#endif
+
 int keylifetime = 0;
 int keyexpires = 0;
 EVP_CIPHER_CTX packet_ctx;
@@ -64,20 +69,21 @@ void send_mtu_probe(node_t *n)
        cp();
 
        n->mtuprobes++;
+       n->mtuevent = NULL;
 
-       if(n->mtuprobes >= 10 && !n->probedmtu) {
+       if(n->mtuprobes >= 10 && !n->minmtu) {
                ifdebug(TRAFFIC) logger(LOG_INFO, _("No response to MTU probes from %s (%s)"), n->name, n->hostname);
                return;
        }
 
        for(i = 0; i < 3; i++) {
-               if(n->mtuprobes >= 30 || n->probedmtu >= n->mtu) {
-                       n->mtu = n->probedmtu;
+               if(n->mtuprobes >= 30 || n->minmtu >= n->maxmtu) {
+                       n->mtu = n->minmtu;
                        ifdebug(TRAFFIC) logger(LOG_INFO, _("Fixing MTU of %s (%s) to %d after %d probes"), n->name, n->hostname, n->mtu, n->mtuprobes);
                        return;
                }
 
-               len = n->probedmtu + 1 + random() % (n->mtu - n->probedmtu);
+               len = n->minmtu + 1 + random() % (n->maxmtu - n->minmtu);
                if(len < 64)
                        len = 64;
                
@@ -104,8 +110,8 @@ void mtu_probe_h(node_t *n, vpn_packet_t *packet) {
                packet->data[0] = 1;
                send_packet(n, packet);
        } else {
-               if(n->probedmtu < packet->len)
-                       n->probedmtu = packet->len;
+               if(n->minmtu < packet->len)
+                       n->minmtu = packet->len;
        }
 }
 
@@ -228,9 +234,11 @@ static void receive_udppacket(node_t *n, vpn_packet_t *inpkt)
                        if(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[(inpkt->seqno / 8) % sizeof(n->late)] |= 1 << i % 8;
                }
        }
        
@@ -347,7 +355,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;
@@ -384,14 +392,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;
 }
 
@@ -405,6 +415,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;
        }