diff options
| author | Todd T. Fries <todd@cvs.openbsd.org> | 2010-10-18 21:38:59 +0000 |
|---|---|---|
| committer | Todd T. Fries <todd@cvs.openbsd.org> | 2010-10-18 21:38:59 +0000 |
| commit | 8269e997179ac4273061a4aabbf1e31dce9f30e8 (patch) | |
| tree | 7cd45e9f7412ef5cd73ed9e438e0054527b0a6be /sbin | |
| parent | e0dcfc0bedc994f72870a6c3848c179b696e97b0 (diff) | |
as determined 4 years ago, FortiGate needs DOI of 0 responses to DPD
so, copy a small bit of logic to make DPD interop with FortiGate function
tested by me, ok mikeb@, silence from 'the usual suspects'
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/isakmpd/isakmp_doi.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/sbin/isakmpd/isakmp_doi.c b/sbin/isakmpd/isakmp_doi.c index f4dfbf9b95d..fa94cbdacce 100644 --- a/sbin/isakmpd/isakmp_doi.c +++ b/sbin/isakmpd/isakmp_doi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isakmp_doi.c,v 1.25 2005/04/08 22:32:10 cloder Exp $ */ +/* $OpenBSD: isakmp_doi.c,v 1.26 2010/10/18 21:38:58 todd Exp $ */ /* $EOM: isakmp_doi.c,v 1.42 2000/09/12 16:29:41 ho Exp $ */ /* @@ -38,6 +38,7 @@ #include <sys/types.h> #include "doi.h" +#include "dpd.h" #include "exchange.h" #include "isakmp.h" #include "isakmp_doi.h" @@ -217,16 +218,29 @@ static int isakmp_responder(struct message *msg) { struct payload *p; + u_int16_t type; switch (msg->exchange->type) { case ISAKMP_EXCH_INFO: for (p = payload_first(msg, ISAKMP_PAYLOAD_NOTIFY); p; p = TAILQ_NEXT(p, link)) { + type = GET_ISAKMP_NOTIFY_MSG_TYPE(p->p); + LOG_DBG((LOG_EXCHANGE, 10, "isakmp_responder: " - "got NOTIFY of type %s, ignoring", + "got NOTIFY of type %s", constant_name(isakmp_notify_cst, - GET_ISAKMP_NOTIFY_MSG_TYPE(p->p)))); - p->flags |= PL_MARK; + type))); + + switch (type) { + case ISAKMP_NOTIFY_STATUS_DPD_R_U_THERE: + case ISAKMP_NOTIFY_STATUS_DPD_R_U_THERE_ACK: + dpd_handle_notify(msg, p); + break; + + default: + p->flags |= PL_MARK; + break; + } } for (p = payload_first(msg, ISAKMP_PAYLOAD_DELETE); p; |