diff options
| -rw-r--r-- | sbin/isakmpd/isakmpd.8 | 6 | ||||
| -rw-r--r-- | sbin/isakmpd/log.h | 6 | ||||
| -rw-r--r-- | sbin/isakmpd/ui.c | 13 |
3 files changed, 14 insertions, 11 deletions
diff --git a/sbin/isakmpd/isakmpd.8 b/sbin/isakmpd/isakmpd.8 index 69c3363c364..b134f23385f 100644 --- a/sbin/isakmpd/isakmpd.8 +++ b/sbin/isakmpd/isakmpd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: isakmpd.8,v 1.55 2003/08/20 12:25:02 ho Exp $ +.\" $OpenBSD: isakmpd.8,v 1.56 2003/10/13 13:57:51 ho Exp $ .\" $EOM: isakmpd.8,v 1.23 2000/05/02 00:30:23 niklas Exp $ .\" .\" Copyright (c) 1998, 1999, 2000, 2001 Niklas Hallqvist. @@ -137,7 +137,7 @@ Valid values for .Ar class are as follows: .Pp -.Bl -tag -width 1n -compact -offset indent +.Bl -tag -width 2n -compact -offset indent .It 0 Misc .It 1 @@ -158,6 +158,8 @@ Exchange Negotiation .It 9 Policy +.It 10 +FIFO user interface .It A All .El diff --git a/sbin/isakmpd/log.h b/sbin/isakmpd/log.h index 4a48327d607..1a88db448c0 100644 --- a/sbin/isakmpd/log.h +++ b/sbin/isakmpd/log.h @@ -1,4 +1,4 @@ -/* $OpenBSD: log.h,v 1.15 2003/06/03 14:28:16 ho Exp $ */ +/* $OpenBSD: log.h,v 1.16 2003/10/13 13:57:51 ho Exp $ */ /* $EOM: log.h,v 1.19 2000/03/30 14:27:23 ho Exp $ */ /* @@ -46,11 +46,11 @@ enum log_classes { LOG_MISC, LOG_TRANSPORT, LOG_MESSAGE, LOG_CRYPTO, LOG_TIMER, LOG_SYSDEP, - LOG_SA, LOG_EXCHANGE, LOG_NEGOTIATION, LOG_POLICY, LOG_ENDCLASS + LOG_SA, LOG_EXCHANGE, LOG_NEGOTIATION, LOG_POLICY, LOG_UI, LOG_ENDCLASS }; #define LOG_CLASSES_TEXT \ { "Misc", "Trpt", "Mesg", "Cryp", "Timr", "Sdep", "SA ", "Exch", "Negt", \ - "Plcy" } + "Plcy", "UI " } /* * "Class" LOG_REPORT will always be logged to the current log channel, diff --git a/sbin/isakmpd/ui.c b/sbin/isakmpd/ui.c index 79990fec8a5..d3a39b5d677 100644 --- a/sbin/isakmpd/ui.c +++ b/sbin/isakmpd/ui.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ui.c,v 1.33 2003/06/03 14:28:16 ho Exp $ */ +/* $OpenBSD: ui.c,v 1.34 2003/10/13 13:57:51 ho Exp $ */ /* $EOM: ui.c,v 1.43 2000/10/05 09:25:12 niklas Exp $ */ /* @@ -110,7 +110,7 @@ ui_connect (char *cmd) log_print ("ui_connect: command \"%s\" malformed", cmd); return; } - log_print ("ui_connect: setup connection \"%s\"", name); + LOG_DBG ((LOG_UI, 10, "ui_connect: setup connection \"%s\"", name)); connection_setup (name); } @@ -126,7 +126,7 @@ ui_teardown (char *cmd) log_print ("ui_teardown: command \"%s\" malformed", cmd); return; } - log_print ("ui_teardown: teardown connection \"%s\"", name); + LOG_DBG ((LOG_UI, 10, "ui_teardown: teardown connection \"%s\"", name)); connection_teardown (name); while ((sa = sa_lookup_by_name (name, 2)) != 0) sa_delete (sa, 1); @@ -178,7 +178,7 @@ ui_config (char *cmd) else goto fail; - log_print ("ui_config: \"%s\"", cmd); + LOG_DBG ((LOG_UI, 30, "ui_config: \"%s\"", cmd)); conf_end (trans, 1); return; @@ -221,8 +221,9 @@ ui_delete (char *cmd) log_print ("ui_delete: command \"%s\" found no SA", cmd); return; } - log_print ("ui_delete: deleting SA for cookie \"%s\" msgid \"%s\"", - cookies_str, message_id_str); + LOG_DBG ((LOG_UI, 20, + "ui_delete: deleting SA for cookie \"%s\" msgid \"%s\"", + cookies_str, message_id_str)); sa_delete (sa, 1); } |