/*
-
-log-client.c
-
-Author: Tatu Ylonen <ylo@cs.hut.fi>
-
-Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
- All rights reserved
-
-Created: Mon Mar 20 21:13:40 1995 ylo
-
-Client-side versions of debug(), log(), etc. These print to stderr.
-
-*/
+ * Author: Tatu Ylonen <ylo@cs.hut.fi>
+ * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
+ * All rights reserved
+ * Client-side versions of debug(), log(), etc. These print to stderr.
+ * This is a stripped down version of log-server.c.
+ *
+ * As far as I am concerned, the code I have written for this software
+ * can be used freely for any purpose. Any derived versions of this
+ * software must be clearly marked as such, and if the derived work is
+ * incompatible with the protocol description in the RFC file, it must be
+ * called by a name other than "ssh" or "Secure Shell".
+ *
+ *
+ * Copyright (c) 2000 Markus Friedl. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
#include "includes.h"
-RCSID("$Id$");
+RCSID("$OpenBSD: log-client.c,v 1.15 2001/01/21 19:05:50 markus Exp $");
#include "xmalloc.h"
-#include "ssh.h"
-
-static int log_debug = 0;
-static int log_quiet = 0;
-
-void log_init(char *av0, int on_stderr, int debug, int quiet,
- SyslogFacility facility)
-{
- log_debug = debug;
- log_quiet = quiet;
-}
-
-void log(const char *fmt, ...)
-{
- va_list args;
+#include "log.h"
- if (log_quiet)
- return;
- va_start(args, fmt);
- vfprintf(stderr, fmt, args);
- fprintf(stderr, "\r\n");
- va_end(args);
-}
+static LogLevel log_level = SYSLOG_LEVEL_INFO;
-void debug(const char *fmt, ...)
-{
- va_list args;
- if (log_quiet || !log_debug)
- return;
- va_start(args, fmt);
- fprintf(stderr, "debug: ");
- vfprintf(stderr, fmt, args);
- fprintf(stderr, "\r\n");
- va_end(args);
-}
+/* Initialize the log.
+ * av0 program name (should be argv[0])
+ * level logging level
+ */
-void error(const char *fmt, ...)
+void
+log_init(char *av0, LogLevel level, SyslogFacility ignored1, int ignored2)
{
- va_list args;
- if (log_quiet)
- return;
- va_start(args, fmt);
- vfprintf(stderr, fmt, args);
- fprintf(stderr, "\r\n");
- va_end(args);
-}
-
-struct fatal_cleanup
-{
- struct fatal_cleanup *next;
- void (*proc)(void *);
- void *context;
-};
-
-static struct fatal_cleanup *fatal_cleanups = NULL;
-
-/* Registers a cleanup function to be called by fatal() before exiting. */
-
-void fatal_add_cleanup(void (*proc)(void *), void *context)
-{
- struct fatal_cleanup *cu;
-
- cu = xmalloc(sizeof(*cu));
- cu->proc = proc;
- cu->context = context;
- cu->next = fatal_cleanups;
- fatal_cleanups = cu;
-}
-
-/* Removes a cleanup frunction to be called at fatal(). */
-
-void fatal_remove_cleanup(void (*proc)(void *context), void *context)
-{
- struct fatal_cleanup **cup, *cu;
-
- for (cup = &fatal_cleanups; *cup; cup = &cu->next)
- {
- cu = *cup;
- if (cu->proc == proc && cu->context == context)
- {
- *cup = cu->next;
- xfree(cu);
- return;
+ switch (level) {
+ case SYSLOG_LEVEL_QUIET:
+ case SYSLOG_LEVEL_FATAL:
+ case SYSLOG_LEVEL_ERROR:
+ case SYSLOG_LEVEL_INFO:
+ case SYSLOG_LEVEL_VERBOSE:
+ case SYSLOG_LEVEL_DEBUG1:
+ case SYSLOG_LEVEL_DEBUG2:
+ case SYSLOG_LEVEL_DEBUG3:
+ log_level = level;
+ break;
+ default:
+ /* unchanged */
+ break;
}
- }
- fatal("fatal_remove_cleanup: no such cleanup function: 0x%lx 0x%lx\n",
- (unsigned long)proc, (unsigned long)context);
}
-/* Function to display an error message and exit. This is in this file because
- this needs to restore terminal modes before exiting. See log-client.c
- for other related functions. */
+#define MSGBUFSIZ 1024
-void fatal(const char *fmt, ...)
+void
+do_log(LogLevel level, const char *fmt, va_list args)
{
- va_list args;
- struct fatal_cleanup *cu, *next_cu;
- static int fatal_called = 0;
-
- if (!fatal_called)
- {
- fatal_called = 1;
-
- /* Call cleanup functions. */
- for (cu = fatal_cleanups; cu; cu = next_cu)
- {
- next_cu = cu->next;
- (*cu->proc)(cu->context);
- }
- }
-
- va_start(args, fmt);
- vfprintf(stderr, fmt, args);
- fprintf(stderr, "\r\n");
- va_end(args);
- exit(255);
+ char msgbuf[MSGBUFSIZ];
+
+ if (level > log_level)
+ return;
+ if (level >= SYSLOG_LEVEL_DEBUG1)
+ fprintf(stderr, "debug: ");
+ vsnprintf(msgbuf, sizeof(msgbuf), fmt, args);
+ fprintf(stderr, "%s\r\n", msgbuf);
}
-
-/* fatal() is in ssh.c so that it can properly reset terminal modes. */
andersk / openssh.git / blobdiff