diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2012-05-03 19:59:03 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2012-05-03 19:59:03 +0200 |
| commit | 1519fd273496e412a3bad908313d5d60cc9f4f57 (patch) | |
| tree | 8e7cbc7cc22b24c1382b5abcd95db7738b0dcb45 | |
| parent | a3459bc67802779b7c2c3aa17ef6d6f2030c9d15 (diff) | |
| download | fastd-1519fd273496e412a3bad908313d5d60cc9f4f57.tar fastd-1519fd273496e412a3bad908313d5d60cc9f4f57.zip | |
Fix critical error introduced by copy-and-pasting, another possible NULL dereference
| -rw-r--r-- | src/protocol_ec25519_fhmqvc.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/protocol_ec25519_fhmqvc.c b/src/protocol_ec25519_fhmqvc.c index 659b4d3..d5ccb60 100644 --- a/src/protocol_ec25519_fhmqvc.c +++ b/src/protocol_ec25519_fhmqvc.c @@ -318,18 +318,6 @@ static bool establish(fastd_context *ctx, const fastd_peer_config *peer_conf, co pr_verbose(ctx, "%I authorized as %P", address, peer); - /*if (backoff(ctx, peer)) { - if (initiator == ctx->conf->method->session_is_initiator(ctx, peer->protocol_state->session.method_state)) { - pr_verbose(ctx, "received repeated handshakes from %P, ignoring", peer); - } - else { - pr_verbose(ctx, "mismatched concurrent handshakes with %P, resetting", peer); - fastd_peer_reset(ctx, peer); - } - - return false; - }*/ - init_peer_state(ctx, peer); if (is_session_valid(ctx, &peer->protocol_state->session) && !is_session_valid(ctx, &peer->protocol_state->old_session)) { @@ -355,7 +343,7 @@ static bool establish(fastd_context *ctx, const fastd_peer_config *peer_conf, co fastd_peer_seen(ctx, peer); if (!fastd_peer_claim_address(ctx, peer, address)) { - pr_warn(ctx, "can't set address %I which is used by a fixed peer", ctx->resolve_returns->addr); + pr_warn(ctx, "can't set address %I which is used by a fixed peer", address); fastd_peer_reset(ctx, peer); return false; } |