From aae5265eb5ebe806414f383f99bb765dbdcaee4b Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 24 Jul 2013 18:44:43 +0200 Subject: Allow specifying multiple remote entries for a single peer --- src/protocol_ec25519_fhmqvc.c | 49 +++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 23 deletions(-) (limited to 'src/protocol_ec25519_fhmqvc.c') diff --git a/src/protocol_ec25519_fhmqvc.c b/src/protocol_ec25519_fhmqvc.c index 487acdc..c9baba4 100644 --- a/src/protocol_ec25519_fhmqvc.c +++ b/src/protocol_ec25519_fhmqvc.c @@ -550,20 +550,31 @@ static void handle_finish_handshake(fastd_context_t *ctx, fastd_socket_t *sock, } static fastd_peer_t* find_sender_key(fastd_context_t *ctx, const fastd_peer_address_t *address, const unsigned char key[32], fastd_peer_t *peers) { - fastd_peer_t *peer; + errno = 0; + + fastd_peer_t *ret = NULL, *peer; + for (peer = peers; peer; peer = peer->next) { - if (memcmp(peer->protocol_config->public_key.p, key, PUBLICKEYBYTES) != 0) - continue; + if (memcmp(peer->protocol_config->public_key.p, key, PUBLICKEYBYTES) == 0) { + if (!fastd_peer_matches_address(ctx, peer, address)) { + errno = EPERM; + return NULL; + } - if (fastd_peer_is_floating(peer)) - return peer; + ret = peer; + continue; + } - errno = EPERM; - return NULL; + if (fastd_peer_owns_address(ctx, peer, address)) { + errno = EPERM; + return NULL; + } } - errno = ENOENT; - return NULL; + if (!ret) + errno = ENOENT; + + return ret; } static fastd_peer_t* match_sender_key(fastd_context_t *ctx, const fastd_socket_t *sock, const fastd_peer_address_t *address, fastd_peer_t *peer, const unsigned char key[32]) { @@ -573,27 +584,19 @@ static fastd_peer_t* match_sender_key(fastd_context_t *ctx, const fastd_socket_t exit_bug(ctx, "packet without correct peer set on dynamic socket"); if (peer) { - if (memcmp(peer->protocol_config->public_key.p, key, PUBLICKEYBYTES) == 0) { - if (sock->peer && sock->peer != peer) { - errno = EPERM; - return NULL; - } - + if (memcmp(peer->protocol_config->public_key.p, key, PUBLICKEYBYTES) == 0) return peer; - } - } - if (peer && !fastd_peer_is_floating(peer) && !fastd_peer_is_dynamic(peer)) { - errno = EPERM; - return NULL; + if (fastd_peer_owns_address(ctx, peer, address)) { + errno = EPERM; + return NULL; + } } peer = find_sender_key(ctx, address, key, ctx->peers); - if (!peer && errno == ENOENT) { - errno = 0; + if (!peer && errno == ENOENT) peer = find_sender_key(ctx, address, key, ctx->peers_temp); - } return peer; } -- cgit v1.2.3