From b1ac9332fd8c9e933c5ff4aa09d1a6091d76af15 Mon Sep 17 00:00:00 2001 From: Brian Somers Date: Fri, 1 May 1998 22:39:38 +0000 Subject: [PATCH] o Mention the ``timer'' log in the man page. o Remove an escaped mention of ``carrier'' logging. o Alphabeticalise timer logging in the log list. --- usr.sbin/ppp/log.c | 4 ++-- usr.sbin/ppp/log.h | 18 +++++++++--------- usr.sbin/ppp/ppp.8 | 7 ++++--- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/usr.sbin/ppp/log.c b/usr.sbin/ppp/log.c index 1a703ac65cbb..89c5fd582354 100644 --- a/usr.sbin/ppp/log.c +++ b/usr.sbin/ppp/log.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: log.c,v 1.25.2.12 1998/04/30 23:53:45 brian Exp $ + * $Id: log.c,v 1.25.2.13 1998/05/01 19:25:06 brian Exp $ */ #include @@ -47,7 +47,6 @@ static const char *LogNames[] = { "Command", "Connect", "Debug", - "Timer", "HDLC", "ID0", "IPCP", @@ -55,6 +54,7 @@ static const char *LogNames[] = { "LQM", "Phase", "TCP/IP", + "Timer", "Tun", "Warning", "Error", diff --git a/usr.sbin/ppp/log.h b/usr.sbin/ppp/log.h index 2df245718da1..08a592057e9c 100644 --- a/usr.sbin/ppp/log.h +++ b/usr.sbin/ppp/log.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: log.h,v 1.18.2.6 1998/04/30 23:53:47 brian Exp $ + * $Id: log.h,v 1.18.2.7 1998/05/01 19:25:08 brian Exp $ */ #define LogMIN (1) @@ -33,14 +33,14 @@ #define LogCOMMAND (4) #define LogCONNECT (5) #define LogDEBUG (6) /* syslog(LOG_DEBUG, ....) */ -#define LogTIMER (7) /* syslog(LOG_DEBUG, ....) */ -#define LogHDLC (8) -#define LogID0 (9) -#define LogIPCP (10) -#define LogLCP (11) -#define LogLQM (12) -#define LogPHASE (13) -#define LogTCPIP (14) +#define LogHDLC (7) +#define LogID0 (8) +#define LogIPCP (9) +#define LogLCP (10) +#define LogLQM (11) +#define LogPHASE (12) +#define LogTCPIP (13) +#define LogTIMER (14) /* syslog(LOG_DEBUG, ....) */ #define LogTUN (15) /* If set, tun%d is output with each message */ #define LogMAXCONF (15) #define LogWARN (16) /* Sent to VarTerm else syslog(LOG_WARNING, ) */ diff --git a/usr.sbin/ppp/ppp.8 b/usr.sbin/ppp/ppp.8 index 09e29e711df6..2e8c50440f21 100644 --- a/usr.sbin/ppp/ppp.8 +++ b/usr.sbin/ppp/ppp.8 @@ -1,4 +1,4 @@ -.\" $Id: ppp.8,v 1.97.2.24 1998/04/24 19:16:15 brian Exp $ +.\" $Id: ppp.8,v 1.97.2.25 1998/04/30 23:53:54 brian Exp $ .Dd 20 September 1995 .Os FreeBSD .Dt PPP 8 @@ -1540,7 +1540,7 @@ or directly to the screen: .It Li Chat Generate Chat script trace log .It Li Command Log commands executed .It Li Connect Generate complete Chat log -.It Li Debug Log (very verbose) debug information +.It Li Debug Log debug information .It Li HDLC Dump HDLC packet in hex .It Li ID0 Log all function calls specifically made as user id 0. .It Li IPCP Generate an IPCP packet trace @@ -1548,6 +1548,7 @@ or directly to the screen: .It Li LQM Generate LQR report .It Li Phase Phase transition log output .It Li TCP/IP Dump all TCP/IP packets +.It Li Timer Log timer manipulation .It Li TUN Include the tun device on each log line .It Li Warning Output to the terminal device. If there is currently no terminal, output is sent to the log file using LOG_WARNING. @@ -1576,7 +1577,7 @@ If The first argument to begins with a '+' or a '-' character, the current log levels are not cleared, for example: .Bd -literal -offset indent -PPP ON awfulhak> set log carrier link phase +PPP ON awfulhak> set log phase PPP ON awfulhak> show log Log: Phase Warning Error Alert Local: Warning Error Alert