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

Slightly relax the connection rate limit for a single address.

Browse source 
The restriction of accepting only 1 connection per second from a single address
is a bit too much, especially if one wants to join a VPN using an invitation,
which requires two connections.
This commit is contained in:
Guus Sliepen 2013-09-02 00:11:04 +02:00
parent 933f7f7526
commit 796c14b75c
1 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/net_socket.c
View file

@ -602,10 +602,22 @@ void handle_new_meta_connection(void *data, int flags) {
tarpit = -1;
}
if(prev_time == now.tv_sec && !sockaddrcmp_noport(&sa, &prev_sa)) {
// if so, keep the connection open but ignore it completely.
tarpit = fd;
return;
if(!sockaddrcmp_noport(&sa, &prev_sa)) {
static int samehost_burst;
static int samehost_burst_time;
if(now.tv_sec - samehost_burst_time > samehost_burst)
samehost_burst = 0;
else
samehost_burst -= now.tv_sec - samehost_burst_time;
samehost_burst_time = now.tv_sec;
samehost_burst++;
if(samehost_burst > max_connection_burst) {
tarpit = fd;
return;
}
}
memcpy(&prev_sa, &sa, sizeof sa);