diff options
| author | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2015-04-20 17:22:19 +0000 |
|---|---|---|
| committer | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2015-04-20 17:22:19 +0000 |
| commit | 9448c2d50688244b2bf110ad782c07ca409d9f4a (patch) | |
| tree | ce0b20bdcb580010c6345e04b57587fd51c96ee1 /sbin/isakmpd | |
| parent | 728c1c303932439e0c9568d7dc7c6058c58691a6 (diff) | |
Log if we refuse to continue the exchange when another one that corresponds
to the same policy is already active. OK markus, hshoexer
Diffstat (limited to 'sbin/isakmpd')
| -rw-r--r-- | sbin/isakmpd/exchange.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sbin/isakmpd/exchange.c b/sbin/isakmpd/exchange.c index 0179af4e030..4a18fd62b3c 100644 --- a/sbin/isakmpd/exchange.c +++ b/sbin/isakmpd/exchange.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exchange.c,v 1.135 2014/01/23 01:04:28 deraadt Exp $ */ +/* $OpenBSD: exchange.c,v 1.136 2015/04/20 17:22:18 mikeb Exp $ */ /* $EOM: exchange.c,v 1.143 2000/12/04 00:02:25 angelos Exp $ */ /* @@ -978,8 +978,13 @@ exchange_setup_p1(struct message *msg, u_int32_t doi) * continue responding if our phase 1 exchange is * still waiting for step 1 (i.e still half-open). */ - if (exchange_lookup_active(name, 1)) + exchange = exchange_lookup_active(name, 1); + if (exchange) { + LOG_DBG((LOG_EXCHANGE, 40, + "exchange_establish: %s exchange already " + "exists as %p", name, exchange)); return 0; + } } else { name = conf_get_str("Phase 1", "Default"); if (!name) { |