diff options
| author | Hakan Olsson <ho@cvs.openbsd.org> | 2004-08-10 15:59:12 +0000 |
|---|---|---|
| committer | Hakan Olsson <ho@cvs.openbsd.org> | 2004-08-10 15:59:12 +0000 |
| commit | ad93a395f096ca7b9a0833d0906d723b7880e483 (patch) | |
| tree | 40283255eb9e94abcc82178a9dbb6c11f09a3932 /sbin/isakmpd/exchange.c | |
| parent | e6aea2c186d9eef5275040b69b69d4764a29f5b8 (diff) | |
Better implementation of the Dead Peer Detection protocol, RFC 3706.
hshoexer@ ok.
Diffstat (limited to 'sbin/isakmpd/exchange.c')
| -rw-r--r-- | sbin/isakmpd/exchange.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/sbin/isakmpd/exchange.c b/sbin/isakmpd/exchange.c index 2d2073c52bf..2deec9cc793 100644 --- a/sbin/isakmpd/exchange.c +++ b/sbin/isakmpd/exchange.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exchange.c,v 1.101 2004/08/08 19:11:06 deraadt Exp $ */ +/* $OpenBSD: exchange.c,v 1.102 2004/08/10 15:59:10 ho Exp $ */ /* $EOM: exchange.c,v 1.143 2000/12/04 00:02:25 angelos Exp $ */ /* @@ -47,9 +47,6 @@ #include "cookie.h" #include "crypto.h" #include "doi.h" -#ifdef USE_DPD -#include "dpd.h" -#endif #include "exchange.h" #include "ipsec_num.h" #include "isakmp.h" @@ -190,10 +187,6 @@ exchange_script(struct exchange *exchange) case ISAKMP_EXCH_TRANSACTION: return script_transaction; #endif -#ifdef USE_DPD - case ISAKMP_EXCH_DPD: - return script_dpd; -#endif default: if (exchange->type >= ISAKMP_EXCH_DOI_MIN && exchange->type <= ISAKMP_EXCH_DOI_MAX) @@ -854,10 +847,9 @@ exchange_establish_p1(struct transport *t, u_int8_t type, u_int32_t doi, } msg->exchange = exchange; - /* Do not create SA for an information, transaction or DPD exchange. */ + /* Do not create SA for an information or transaction exchange. */ if (exchange->type != ISAKMP_EXCH_INFO - && exchange->type != ISAKMP_EXCH_TRANSACTION - && exchange->type != ISAKMP_EXCH_DPD) { + && exchange->type != ISAKMP_EXCH_TRANSACTION) { /* * Don't install a transport into this SA as it will be an * INADDR_ANY address in the local end, which is not good at @@ -970,8 +962,7 @@ exchange_establish_p2(struct sa *isakmp_sa, u_int8_t type, char *name, * XXX How to handle new group mode? */ if (exchange->type != ISAKMP_EXCH_INFO && - exchange->type != ISAKMP_EXCH_TRANSACTION && - exchange->type != ISAKMP_EXCH_DPD) { + exchange->type != ISAKMP_EXCH_TRANSACTION) { /* XXX Number of SAs should come from the args structure. */ for (i = 0; i < 1; i++) if (sa_create(exchange, isakmp_sa->transport)) { |