j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Better handling of late packets.

Browse source
This commit is contained in:
Guus Sliepen 2003-04-18 21:18:36 +00:00
parent 51a1bcf001
commit bc9e78250e
3 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/net_packet.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: net_packet.c,v 1.1.2.26 2003/03/28 13:41:49 guus Exp $ $Id: net_packet.c,v 1.1.2.27 2003/04/18 21:18:36 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -95,6 +95,7 @@ void receive_udppacket(node_t *n, vpn_packet_t *inpkt)
int outlen, outpad; int outlen, outpad;
long int complen = MTU + 12; long int complen = MTU + 12;
char hmac[EVP_MAX_MD_SIZE]; char hmac[EVP_MAX_MD_SIZE];
int i;
cp(); cp();
@ -133,16 +134,26 @@ void receive_udppacket(node_t *n, vpn_packet_t *inpkt)
inpkt->len -= sizeof(inpkt->seqno); inpkt->len -= sizeof(inpkt->seqno);
inpkt->seqno = ntohl(inpkt->seqno); inpkt->seqno = ntohl(inpkt->seqno);
if(inpkt->seqno <= n->received_seqno) { if(inpkt->seqno != n->received_seqno + 1) {
if(debug_lvl >= DEBUG_TRAFFIC) if(inpkt->seqno >= n->received_seqno + sizeof(n->late) * 8) {
syslog(LOG_DEBUG, if(debug_lvl >= DEBUG_TRAFFIC)
_("Got late or replayed packet from %s (%s), seqno %d"), syslog(LOG_WARNING, _("Lost %d packets from %s (%s)"),
n->name, n->hostname, inpkt->seqno); inpkt->seqno - n->received_seqno - 1, n->name, n->hostname);
return;
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))) {
syslog(LOG_WARNING, _("Got late or replayed packet from %s (%s), seqno %d, last received %d"),
n->name, n->hostname, inpkt->seqno, n->received_seqno, n->late[(inpkt->seqno / 8) % sizeof(n->late)]);
} else
for(i = n->received_seqno + 1; i < inpkt->seqno; i++)
n->late[(inpkt->seqno / 8) % sizeof(n->late)] |= 1 << i % 8;
}
} }
n->received_seqno = inpkt->seqno; n->received_seqno = inpkt->seqno;
n->late[(n->received_seqno / 8) % sizeof(n->late)] &= ~(1 << n->received_seqno % 8);
if(n->received_seqno > MAX_SEQNO) if(n->received_seqno > MAX_SEQNO)
keyexpires = 0; keyexpires = 0;

3
src/node.h
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: node.h,v 1.1.2.20 2002/09/09 21:24:41 guus Exp $ $Id: node.h,v 1.1.2.21 2003/04/18 21:18:36 guus Exp $
*/ */
#ifndef __TINC_NODE_H__ #ifndef __TINC_NODE_H__
@ -73,6 +73,7 @@ typedef struct node_t {
uint32_t sent_seqno; /* Sequence number last sent to this node */ uint32_t sent_seqno; /* Sequence number last sent to this node */
uint32_t received_seqno; /* Sequence number last received from this node */ uint32_t received_seqno; /* Sequence number last received from this node */
unsigned char late[16]; /* Bitfield marking late packets */
} node_t; } node_t;
extern struct node_t *myself; extern struct node_t *myself;

3
src/protocol_key.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: protocol_key.c,v 1.1.4.14 2002/09/09 22:33:03 guus Exp $ $Id: protocol_key.c,v 1.1.4.15 2003/04/18 21:18:36 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -135,6 +135,7 @@ int req_key_h(connection_t *c)
if(to == myself) { /* Yes, send our own key back */ if(to == myself) { /* Yes, send our own key back */
mykeyused = 1; mykeyused = 1;
from->received_seqno = 0; from->received_seqno = 0;
memset(from->late, 0, sizeof(from->late));
send_ans_key(c, myself, from); send_ans_key(c, myself, from);
} else { } else {
send_req_key(to->nexthop->connection, from, to); send_req_key(to->nexthop->connection, from, to);