fastd/fastd
1
0
Fork 0
mirror of https://github.com/neocturne/fastd.git synced 2025-05-14 12:25:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Limit handshake frequency where possible

Browse source
This commit is contained in:
Matthias Schiffer 2012-06-07 00:56:47 +02:00
parent 25bf4f4901
commit b0a169a146
6 changed files with 35 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/config.c
View file

@ -63,6 +63,7 @@ static void default_config(fastd_config *conf) {
conf->reorder_count = 64;
conf->reorder_time = 10;
conf->min_handshake_interval = 15;
conf->min_resolve_interval = 15;
conf->ifname = NULL;

12
src/fastd.c
View file

@ -403,8 +403,16 @@ static inline void update_time(fastd_context *ctx) {
static inline void send_handshake(fastd_context *ctx, fastd_peer *peer) {
if (peer->address.sa.sa_family != AF_UNSPEC) {
pr_debug(ctx, "sending handshake to %P...", peer);
ctx->conf->protocol->handshake_init(ctx, &peer->address, peer->config);
if (timespec_diff(&ctx->now, &peer->last_handshake) < ctx->conf->min_handshake_interval*1000
&& fastd_peer_address_equal(&peer->address, &peer->last_handshake_address)) {
pr_debug(ctx, "not sending a handshake to %P as we sent one a short time ago", peer);
}
else {
pr_debug(ctx, "sending handshake to %P...", peer);
peer->last_handshake = ctx->now;
peer->last_handshake_address = peer->address;
ctx->conf->protocol->handshake_init(ctx, &peer->address, peer->config);
}
}
fastd_task_schedule_handshake(ctx, peer, fastd_rand(ctx, 17500, 22500));

1
src/fastd.h
View file

@ -136,6 +136,7 @@ struct _fastd_config {
unsigned reorder_count;
unsigned reorder_time;
unsigned min_handshake_interval;
unsigned min_resolve_interval;
char *ifname;

8
src/peer.c
View file

@ -176,9 +176,17 @@ static inline void setup_peer(fastd_context *ctx, fastd_peer *peer) {
peer->address = peer->config->address;
peer->established = false;
peer->last_resolve = (struct timespec){0, 0};
peer->last_resolve_return = (struct timespec){0, 0};
peer->seen = (struct timespec){0, 0};
peer->last_handshake = (struct timespec){0, 0};
peer->last_handshake_address.sa.sa_family = AF_UNSPEC;
peer->last_handshake_response = (struct timespec){0, 0};
peer->last_handshake_response_address.sa.sa_family = AF_UNSPEC;
peer->protocol_state = NULL;
if (!fastd_peer_is_floating(peer))

6
src/peer.h
View file

@ -43,6 +43,12 @@ struct _fastd_peer {
struct timespec last_resolve_return;
struct timespec seen;
struct timespec last_handshake;
fastd_peer_address last_handshake_address;
struct timespec last_handshake_response;
fastd_peer_address last_handshake_response_address;
fastd_protocol_peer_state *protocol_state;
};

10
src/protocol_ec25519_fhmqvc.c
View file

@ -577,12 +577,20 @@ static void protocol_handshake_handle(fastd_context *ctx, const fastd_peer_addre
switch(handshake->type) {
case 1:
if (timespec_diff(&ctx->now, &peer->last_handshake_response) < ctx->conf->min_handshake_interval*1000
&& fastd_peer_address_equal(address, &peer->last_handshake_response_address)) {
pr_debug(ctx, "not responding repeated handshake from %P[%I]", peer, address);
return;
}
if (handshake->records[RECORD_VERSION_NAME].data)
peer_version_name = strndup(handshake->records[RECORD_VERSION_NAME].data, handshake->records[RECORD_VERSION_NAME].length);
pr_verbose(ctx, "received handshake from %P[%I] using fastd %s", peer, address, peer_version_name);
free(peer_version_name);
peer->last_handshake_response = ctx->now;
peer->last_handshake_response_address = *address;
respond_handshake(ctx, address, peer, &ctx->protocol_state->handshake_key, handshake->records[RECORD_SENDER_HANDSHAKE_KEY].data, handshake);
break;