projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/linux/device.c: Fix segfault when running without `--net'.
[tinc]
/
src
/
protocol_misc.c
diff --git
a/src/protocol_misc.c
b/src/protocol_misc.c
index
ea71d6b
..
8f56aee
100644
(file)
--- a/
src/protocol_misc.c
+++ b/
src/protocol_misc.c
@@
-1,7
+1,7
@@
/*
protocol_misc.c -- handle the meta-protocol, miscellaneous functions
/*
protocol_misc.c -- handle the meta-protocol, miscellaneous functions
- Copyright (C) 1999-2005 Ivo Timmermans
<ivo@tinc-vpn.org>
,
- 2000-200
5
Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 1999-2005 Ivo Timmermans,
+ 2000-200
6
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
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
@@
-31,6
+31,8
@@
#include "protocol.h"
#include "utils.h"
#include "protocol.h"
#include "utils.h"
+int maxoutbufsize = 0;
+
/* Status and error notification routines */
bool send_status(connection_t *c, int statusno, const char *statusstring)
/* Status and error notification routines */
bool send_status(connection_t *c, int statusno, const char *statusstring)
@@
-153,12
+155,16
@@
bool send_tcppacket(connection_t *c, vpn_packet_t *packet)
{
cp();
{
cp();
- /* Evil hack. */
+ /* If there already is a lot of data in the outbuf buffer, discard this packet.
+ We use a very simple Random Early Drop algorithm. */
+
+ if(2.0 * c->outbuflen / (double)maxoutbufsize - 1 > drand48())
+ return true;
if(!send_request(c, "%d %hd", PACKET, packet->len))
return false;
if(!send_request(c, "%d %hd", PACKET, packet->len))
return false;
- return send_meta(c, packet->data, packet->len);
+ return send_meta(c,
(char *)
packet->data, packet->len);
}
bool tcppacket_h(connection_t *c)
}
bool tcppacket_h(connection_t *c)