From 0c2f5da1650a295c29001e50384ec2f605055aed Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 5 Nov 2012 10:11:17 +0100 Subject: Fix some more bugs in fastd_peer_claim_address --- src/peer.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) (limited to 'src/peer.c') diff --git a/src/peer.c b/src/peer.c index 47e863e..97c21ed 100644 --- a/src/peer.c +++ b/src/peer.c @@ -326,22 +326,25 @@ bool fastd_peer_claim_address(fastd_context *ctx, fastd_peer *new_peer, fastd_so else { fastd_peer *peer; for (peer = ctx->peers; peer; peer = peer->next) { - if (fastd_peer_address_equal(&peer->address, addr)) { - if (peer == new_peer) - break; - - if (fastd_peer_is_floating(peer) || fastd_peer_is_dynamic(peer)) { - if (fastd_peer_is_established(peer)) - fastd_peer_reset(ctx, peer); - - memset(&peer->address, 0, sizeof(fastd_peer_address)); - break; - } - else { - memset(&new_peer->address, 0, sizeof(fastd_peer_address)); - return false; - } + if (!fastd_peer_address_equal(&peer->address, addr)) + continue; + + if (peer == new_peer) + break; + + if (!fastd_peer_is_floating(peer)) { + if (fastd_peer_is_established(new_peer)) + fastd_peer_reset(ctx, new_peer); + + memset(&new_peer->address, 0, sizeof(fastd_peer_address)); + return false; } + + if (fastd_peer_is_established(peer)) + fastd_peer_reset(ctx, peer); + + memset(&peer->address, 0, sizeof(fastd_peer_address)); + break; } } -- cgit v1.2.3