diff options
author | lum <lum@cvs.openbsd.org> | 2011-04-23 03:17:05 +0000 |
---|---|---|
committer | lum <lum@cvs.openbsd.org> | 2011-04-23 03:17:05 +0000 |
commit | ce0fb26d1ac40f741bc1f021438145b1c31a6f4e (patch) | |
tree | 9619798f02e3b0dfe118ee816222872e7cea3f4c | |
parent | 465fcedc866499ff12e9dba0038b798a6eac29c8 (diff) |
Indicate which side of the connection responded during phase 1 while using -v.
ok sthen@ markus@
-rw-r--r-- | sbin/isakmpd/exchange.c | 6 | ||||
-rw-r--r-- | sbin/isakmpd/ike_quick_mode.c | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/sbin/isakmpd/exchange.c b/sbin/isakmpd/exchange.c index 89bc1e2e3e7..7924e818c92 100644 --- a/sbin/isakmpd/exchange.c +++ b/sbin/isakmpd/exchange.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exchange.c,v 1.133 2009/01/28 13:24:07 hshoexer Exp $ */ +/* $OpenBSD: exchange.c,v 1.134 2011/04/23 03:17:04 lum Exp $ */ /* $EOM: exchange.c,v 1.143 2000/12/04 00:02:25 angelos Exp $ */ /* @@ -1427,7 +1427,9 @@ exchange_finalize(struct message *msg) "exchange_finalize: phase 1 done: %s, %s", id_doi, id_trp)); - log_verbose("isakmpd: phase 1 done: %s, %s", id_doi, id_trp); + log_verbose("isakmpd: phase 1 done%s: %s, %s", + (exchange->initiator == 0) ? " (as responder)" : "", + id_doi, id_trp); } exchange->doi->finalize_exchange(msg); if (exchange->finalize) diff --git a/sbin/isakmpd/ike_quick_mode.c b/sbin/isakmpd/ike_quick_mode.c index 50d771e4bbd..fb8ad54b08b 100644 --- a/sbin/isakmpd/ike_quick_mode.c +++ b/sbin/isakmpd/ike_quick_mode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ike_quick_mode.c,v 1.105 2010/06/29 19:50:16 reyk Exp $ */ +/* $OpenBSD: ike_quick_mode.c,v 1.106 2011/04/23 03:17:04 lum Exp $ */ /* $EOM: ike_quick_mode.c,v 1.139 2001/01/26 10:43:17 niklas Exp $ */ /* @@ -1432,7 +1432,8 @@ post_quick_mode(struct message *msg) } } - log_verbose("isakmpd: quick mode done: %s", + log_verbose("isakmpd: quick mode done%s: %s", + (exchange->initiator == 0) ? " (as responder)" : "", !msg->isakmp_sa || !msg->isakmp_sa->transport ? "<no transport>" : msg->isakmp_sa->transport->vtbl->decode_ids (msg->isakmp_sa->transport)); |