b6217683dc
o Our diagnostic socket has its password set in the `set socket'
line only (not in ppp.secret).
o Passwords are per server socket (*VarAuthKey are gone)
o Authority is per prompt (VarLocalAuth is gone).
o Local logging is per prompt.
o Add a `show who' command to see who's connected. No identd
routine - just a `where the connection came from' display.
o SIGUSR1 is disabled for now - we have no way of choosing a
password for the socket created :-(
Prompts are attached as a list of `struct descriptor's in
struct bundle, and serviced under the bundles descriptor
service routines. Ultimately, everything should be done
like this.
Cosmetic:
o alphabeticalise SRCS in Makefile.
o Add a few comments in command.h
TODO: Start checking that we don't overflow the descriptor sets
in select() now that we can have any number of descriptors.
382 lines
8.1 KiB
C
382 lines
8.1 KiB
C
/*-
|
|
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
|
|
* 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
|
|
*
|
|
* $Id: log.c,v 1.25.2.1 1998/02/10 03:23:25 brian Exp $
|
|
*/
|
|
|
|
#include <sys/param.h>
|
|
#include <netinet/in.h>
|
|
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <syslog.h>
|
|
#include <termios.h>
|
|
|
|
#include "command.h"
|
|
#include "mbuf.h"
|
|
#include "log.h"
|
|
#include "loadalias.h"
|
|
#include "defs.h"
|
|
#include "vars.h"
|
|
#include "descriptor.h"
|
|
#include "prompt.h"
|
|
|
|
static const char *LogNames[] = {
|
|
"Async",
|
|
"Carrier",
|
|
"CCP",
|
|
"Chat",
|
|
"Command",
|
|
"Connect",
|
|
"Debug",
|
|
"HDLC",
|
|
"ID0",
|
|
"IPCP",
|
|
"LCP",
|
|
"Link",
|
|
"LQM",
|
|
"Phase",
|
|
"TCP/IP",
|
|
"Tun",
|
|
"Warning",
|
|
"Error",
|
|
"Alert"
|
|
};
|
|
|
|
#define MSK(n) (1<<((n)-1))
|
|
|
|
static u_long LogMask = MSK(LogLINK) | MSK(LogCARRIER) | MSK(LogPHASE);
|
|
static u_long LogMaskLocal = MSK(LogERROR) | MSK(LogALERT) | MSK(LogWARN);
|
|
static int LogTunno = -1;
|
|
static struct prompt *logprompt; /* Where to log local stuff */
|
|
|
|
void
|
|
log_RegisterPrompt(struct prompt *prompt)
|
|
{
|
|
if (prompt) {
|
|
prompt->lognext = logprompt;
|
|
logprompt = prompt;
|
|
LogMaskLocal |= prompt->logmask;
|
|
}
|
|
}
|
|
|
|
void
|
|
log_UnRegisterPrompt(struct prompt *prompt)
|
|
{
|
|
if (prompt) {
|
|
struct prompt **p;
|
|
|
|
LogMaskLocal = MSK(LogERROR) | MSK(LogALERT) | MSK(LogWARN);
|
|
for (p = &logprompt; *p; p = &(*p)->lognext) {
|
|
if (*p == prompt) {
|
|
*p = (*p)->lognext;
|
|
prompt->lognext = NULL;
|
|
if (!*p)
|
|
break;
|
|
}
|
|
LogMaskLocal |= (*p)->logmask;
|
|
}
|
|
}
|
|
}
|
|
|
|
static int
|
|
syslogLevel(int lev)
|
|
{
|
|
switch (lev) {
|
|
case LogDEBUG:return LOG_DEBUG;
|
|
case LogWARN:
|
|
return LOG_WARNING;
|
|
case LogERROR:
|
|
return LOG_ERR;
|
|
case LogALERT:
|
|
return LOG_ALERT;
|
|
}
|
|
return lev >= LogMIN && lev <= LogMAX ? LOG_INFO : 0;
|
|
}
|
|
|
|
const char *
|
|
LogName(int id)
|
|
{
|
|
return id < LogMIN || id > LogMAX ? "Unknown" : LogNames[id - 1];
|
|
}
|
|
|
|
void
|
|
LogKeep(int id)
|
|
{
|
|
if (id >= LogMIN && id <= LogMAXCONF)
|
|
LogMask |= MSK(id);
|
|
}
|
|
|
|
void
|
|
LogKeepLocal(int id, u_long *mask)
|
|
{
|
|
if (id >= LogMIN && id <= LogMAXCONF) {
|
|
LogMaskLocal |= MSK(id);
|
|
*mask |= MSK(id);
|
|
}
|
|
}
|
|
|
|
void
|
|
LogDiscard(int id)
|
|
{
|
|
if (id >= LogMIN && id <= LogMAXCONF)
|
|
LogMask &= ~MSK(id);
|
|
}
|
|
|
|
void
|
|
LogDiscardLocal(int id, u_long *mask)
|
|
{
|
|
if (id >= LogMIN && id <= LogMAXCONF) {
|
|
LogMaskLocal &= ~MSK(id);
|
|
*mask &= ~MSK(id);
|
|
}
|
|
}
|
|
|
|
void
|
|
LogDiscardAll()
|
|
{
|
|
LogMask = 0;
|
|
}
|
|
|
|
void
|
|
LogDiscardAllLocal(u_long *mask)
|
|
{
|
|
LogMaskLocal = *mask = MSK(LogERROR) | MSK(LogALERT) | MSK(LogWARN);
|
|
}
|
|
|
|
int
|
|
LogIsKept(int id)
|
|
{
|
|
if (id < LogMIN || id > LogMAX)
|
|
return 0;
|
|
if (id > LogMAXCONF)
|
|
return LOG_KEPT_LOCAL | LOG_KEPT_SYSLOG;
|
|
|
|
return ((LogMaskLocal & MSK(id)) ? LOG_KEPT_LOCAL : 0) |
|
|
((LogMask & MSK(id)) ? LOG_KEPT_SYSLOG : 0);
|
|
}
|
|
|
|
int
|
|
LogIsKeptLocal(int id, u_long mask)
|
|
{
|
|
if (id < LogMIN || id > LogMAX)
|
|
return 0;
|
|
if (id > LogMAXCONF)
|
|
return LOG_KEPT_LOCAL | LOG_KEPT_SYSLOG;
|
|
|
|
return ((mask & MSK(id)) ? LOG_KEPT_LOCAL : 0) |
|
|
((LogMask & MSK(id)) ? LOG_KEPT_SYSLOG : 0);
|
|
}
|
|
|
|
void
|
|
LogOpen(const char *Name)
|
|
{
|
|
openlog(Name, LOG_PID, LOG_DAEMON);
|
|
}
|
|
|
|
void
|
|
LogSetTun(int tunno)
|
|
{
|
|
LogTunno = tunno;
|
|
}
|
|
|
|
void
|
|
LogClose()
|
|
{
|
|
closelog();
|
|
LogTunno = -1;
|
|
}
|
|
|
|
void
|
|
LogPrintf(int lev, const char *fmt,...)
|
|
{
|
|
va_list ap;
|
|
struct prompt *prompt;
|
|
|
|
va_start(ap, fmt);
|
|
if (LogIsKept(lev)) {
|
|
static char nfmt[200];
|
|
|
|
if ((LogIsKept(lev) & LOG_KEPT_LOCAL) && logprompt) {
|
|
if ((LogIsKept(LogTUN) & LOG_KEPT_LOCAL) && LogTunno != -1)
|
|
snprintf(nfmt, sizeof nfmt, "tun%d: %s: %s",
|
|
LogTunno, LogName(lev), fmt);
|
|
else
|
|
snprintf(nfmt, sizeof nfmt, "%s: %s", LogName(lev), fmt);
|
|
|
|
for (prompt = logprompt; prompt; prompt = prompt->lognext)
|
|
if (lev > LogMAXCONF || (prompt->logmask & MSK(lev)))
|
|
prompt_vPrintf(prompt, nfmt, ap);
|
|
}
|
|
|
|
if ((LogIsKept(lev) & LOG_KEPT_SYSLOG) && (lev != LogWARN || !logprompt)) {
|
|
if ((LogIsKept(LogTUN) & LOG_KEPT_SYSLOG) && LogTunno != -1)
|
|
snprintf(nfmt, sizeof nfmt, "tun%d: %s: %s",
|
|
LogTunno, LogName(lev), fmt);
|
|
else
|
|
snprintf(nfmt, sizeof nfmt, "%s: %s", LogName(lev), fmt);
|
|
vsyslog(syslogLevel(lev), nfmt, ap);
|
|
}
|
|
}
|
|
va_end(ap);
|
|
}
|
|
|
|
void
|
|
LogDumpBp(int lev, const char *hdr, const struct mbuf * bp)
|
|
{
|
|
if (LogIsKept(lev)) {
|
|
char buf[50];
|
|
char *b;
|
|
u_char *ptr;
|
|
int f;
|
|
|
|
if (hdr && *hdr)
|
|
LogPrintf(lev, "%s\n", hdr);
|
|
|
|
b = buf;
|
|
do {
|
|
f = bp->cnt;
|
|
ptr = MBUF_CTOP(bp);
|
|
while (f--) {
|
|
sprintf(b, " %02x", (int) *ptr++);
|
|
b += 3;
|
|
if (b == buf + sizeof buf - 2) {
|
|
strcpy(b, "\n");
|
|
LogPrintf(lev, buf);
|
|
b = buf;
|
|
}
|
|
}
|
|
} while ((bp = bp->next) != NULL);
|
|
|
|
if (b > buf) {
|
|
strcpy(b, "\n");
|
|
LogPrintf(lev, buf);
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
LogDumpBuff(int lev, const char *hdr, const u_char * ptr, int n)
|
|
{
|
|
if (LogIsKept(lev)) {
|
|
char buf[50];
|
|
char *b;
|
|
|
|
if (hdr && *hdr)
|
|
LogPrintf(lev, "%s\n", hdr);
|
|
while (n > 0) {
|
|
b = buf;
|
|
for (b = buf; b != buf + sizeof buf - 2 && n--; b += 3)
|
|
sprintf(b, " %02x", (int) *ptr++);
|
|
strcpy(b, "\n");
|
|
LogPrintf(lev, buf);
|
|
}
|
|
}
|
|
}
|
|
|
|
int
|
|
log_ShowLevel(struct cmdargs const *arg)
|
|
{
|
|
int i;
|
|
|
|
prompt_Printf(arg->prompt, "Log: ");
|
|
for (i = LogMIN; i <= LogMAX; i++)
|
|
if (LogIsKept(i) & LOG_KEPT_SYSLOG)
|
|
prompt_Printf(arg->prompt, " %s", LogName(i));
|
|
|
|
prompt_Printf(arg->prompt, "\nLocal:");
|
|
for (i = LogMIN; i <= LogMAX; i++)
|
|
if (LogIsKeptLocal(i, arg->prompt->logmask) & LOG_KEPT_LOCAL)
|
|
prompt_Printf(arg->prompt, " %s", LogName(i));
|
|
|
|
prompt_Printf(arg->prompt, "\n");
|
|
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
log_SetLevel(struct cmdargs const *arg)
|
|
{
|
|
int i, res, argc, local;
|
|
char const *const *argv, *argp;
|
|
|
|
argc = arg->argc;
|
|
argv = arg->argv;
|
|
res = 0;
|
|
|
|
if (argc == 0 || strcasecmp(argv[0], "local"))
|
|
local = 0;
|
|
else {
|
|
if (arg->prompt == NULL) {
|
|
LogPrintf(LogWARN, "set log local: Only available on the command line\n");
|
|
return 1;
|
|
}
|
|
argc--;
|
|
argv++;
|
|
local = 1;
|
|
}
|
|
|
|
if (argc == 0 || (argv[0][0] != '+' && argv[0][0] != '-'))
|
|
if (local)
|
|
LogDiscardAllLocal(&arg->prompt->logmask);
|
|
else
|
|
LogDiscardAll();
|
|
|
|
while (argc--) {
|
|
argp = **argv == '+' || **argv == '-' ? *argv + 1 : *argv;
|
|
for (i = LogMIN; i <= LogMAX; i++)
|
|
if (strcasecmp(argp, LogName(i)) == 0) {
|
|
if (**argv == '-')
|
|
if (local)
|
|
LogDiscardLocal(i, &arg->prompt->logmask);
|
|
else
|
|
LogDiscard(i);
|
|
else if (local)
|
|
LogKeepLocal(i, &arg->prompt->logmask);
|
|
else
|
|
LogKeep(i);
|
|
break;
|
|
}
|
|
if (i > LogMAX) {
|
|
LogPrintf(LogWARN, "%s: Invalid log value\n", argp);
|
|
res = -1;
|
|
}
|
|
argv++;
|
|
}
|
|
return res;
|
|
}
|
|
|
|
int
|
|
log_ShowWho(struct cmdargs const *arg)
|
|
{
|
|
struct prompt *p;
|
|
|
|
for (p = logprompt; p; p = p->lognext)
|
|
prompt_Printf(arg->prompt, "%s%s\n", p->who, p == arg->prompt ? " *" : "");
|
|
|
|
return 0;
|
|
}
|