927145be97
o Use syslog
o Remove references to stdout/stderr (incl perror())
o Introduce VarTerm - the interactive terminal or zero
o Allow "set timeout" to affect current session
o Change "set debug" to "set log"
o Allow "set log [+|-]flag"
o Make MSEXT and PASSWDAUTH stuff the default
o Move all #ifdef DEBUG stuff into the code - this
shouldn't be too much overhead. It's now controlled
with "set log +debug"
o Add "set log command, debug, tun, warn, error, alert"
o Remove cdefs.h, and assume an ansi compiler.
o Improve all diagnostic output
o Don't trap SIGSEGV
o SIGHUP now terminates again (log files are controlled
by syslog)
o Call CloseModem() when changing devices
o Fix parsing of third arg of "delete"
I think this fixes the "magic is same" problems that some
people have been experiencing.
The man page is being rewritten. It'll follow soon.
149 lines
2.6 KiB
C
149 lines
2.6 KiB
C
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/param.h>
|
|
#include <netinet/in.h>
|
|
#include <syslog.h>
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
#include "mbuf.h"
|
|
#include "log.h"
|
|
#include "loadalias.h"
|
|
#include "vars.h"
|
|
|
|
static char *LogNames[] = {
|
|
"Async",
|
|
"Carrier",
|
|
"Chat",
|
|
"Command",
|
|
"Connect",
|
|
"Debug",
|
|
"HDLC",
|
|
"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 int LogTunno = -1;
|
|
|
|
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
|
|
LogDiscard(int id)
|
|
{
|
|
if (id >= LogMIN && id <= LogMAXCONF)
|
|
LogMask &= ~MSK(id);
|
|
}
|
|
|
|
void
|
|
LogDiscardAll()
|
|
{
|
|
LogMask = 0;
|
|
}
|
|
|
|
int
|
|
LogIsKept(int id)
|
|
{
|
|
if (id < LogMIN)
|
|
return 0;
|
|
if (id <= LogMAXCONF)
|
|
return LogMask & MSK(id);
|
|
return id <= LogMAX;
|
|
}
|
|
|
|
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, char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
va_start(ap, fmt);
|
|
if (LogIsKept(lev)) {
|
|
static char nfmt[200];
|
|
|
|
if (LogIsKept(LogTUN) && LogTunno != -1)
|
|
snprintf(nfmt, sizeof nfmt, "tun%d: %s: %s",
|
|
LogTunno, LogName(lev), fmt);
|
|
else
|
|
snprintf(nfmt, sizeof nfmt, "%s: %s", LogName(lev), fmt);
|
|
if ((lev == LogERROR || lev == LogALERT || lev == LogWARN) && VarTerm)
|
|
vfprintf(VarTerm, fmt, ap);
|
|
if (lev != LogWARN || !VarTerm)
|
|
vsyslog(syslogLevel(lev), nfmt, ap);
|
|
}
|
|
va_end(ap);
|
|
}
|
|
|
|
void
|
|
LogDumpBp(int lev, char *hdr, struct mbuf *bp)
|
|
{
|
|
LogDumpBuff(lev, hdr, MBUF_CTOP(bp), bp->cnt);
|
|
}
|
|
|
|
void
|
|
LogDumpBuff(int lev, char *hdr, u_char *ptr, int n)
|
|
{
|
|
if (LogIsKept(lev)) {
|
|
char buf[49];
|
|
char *b;
|
|
int f;
|
|
|
|
if (hdr && *hdr)
|
|
LogPrintf(lev, "%s", hdr);
|
|
while (n > 0) {
|
|
b = buf;
|
|
for (f = 0; f < 16 && n--; f++, b += 3)
|
|
sprintf(b, " %02x", (int)*ptr++);
|
|
LogPrintf(lev, buf);
|
|
}
|
|
}
|
|
}
|