6815097bf7
being the same as the previous (still supported) ``host:port'' syntax for tcp socket devices. A udp device uses synchronous ppp rather than async, and avoids the double-retransmit overhead that comes with ppp over tcp (it's usually a bad idea to transport IP over a reliable transport that itself is using an unreliable transport). PPP over UDP provides througput of ** 1.5Mb per second ** with all compression disabled, maxing out a PPro/200 when running ppp twice, back-to-back. This proves that PPPoE is plausable in userland.... This change adds a few more handler functions to struct device and allows derivations of struct device (which may contain their own data etc) to pass themselves through the unix domain socket for MP. ** At last **, struct physical has lost all the tty crud ! iov2physical() is now smart enough to restore the correct stack of layers so that MP servers will work again. The version number has bumped as our MP link transfer contents have changed (they now may contain a `struct device'). Don't extract the protocol twice in MP mode (resulting in protocol rejects for every MP packet). This was broken with my original layering changes. Add ``Physical'' and ``Sync'' log levels for logging the relevent raw packets and add protocol-tracking LogDEBUG stuff in various LayerPush & LayerPull functions. Assign our physical device name for incoming tcp connections by calling getpeername(). Assign our physical device name for incoming udp connections from the address retrieved by the first recvfrom().
476 lines
9.6 KiB
C
476 lines
9.6 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.37 1999/05/09 20:02:22 brian Exp $
|
|
*/
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <syslog.h>
|
|
#include <termios.h>
|
|
|
|
#include "defs.h"
|
|
#include "command.h"
|
|
#include "mbuf.h"
|
|
#include "log.h"
|
|
#include "descriptor.h"
|
|
#include "prompt.h"
|
|
|
|
static const char *LogNames[] = {
|
|
"Async",
|
|
"CBCP",
|
|
"CCP",
|
|
"Chat",
|
|
"Command",
|
|
"Connect",
|
|
"Debug",
|
|
"HDLC",
|
|
"ID0",
|
|
"IPCP",
|
|
"LCP",
|
|
"LQM",
|
|
"Phase",
|
|
"Physical",
|
|
"Sync",
|
|
"TCP/IP",
|
|
"Timer",
|
|
"Tun",
|
|
"Warning",
|
|
"Error",
|
|
"Alert"
|
|
};
|
|
|
|
#define MSK(n) (1<<((n)-1))
|
|
|
|
static u_long LogMask = MSK(LogPHASE);
|
|
static u_long LogMaskLocal = MSK(LogERROR) | MSK(LogALERT) | MSK(LogWARN);
|
|
static int LogTunno = -1;
|
|
static struct prompt *promptlist; /* Where to log local stuff */
|
|
int log_PromptListChanged;
|
|
|
|
struct prompt *
|
|
log_PromptList()
|
|
{
|
|
return promptlist;
|
|
}
|
|
|
|
void
|
|
log_RegisterPrompt(struct prompt *prompt)
|
|
{
|
|
prompt->next = promptlist;
|
|
promptlist = prompt;
|
|
prompt->active = 1;
|
|
log_DiscardAllLocal(&prompt->logmask);
|
|
}
|
|
|
|
void
|
|
log_ActivatePrompt(struct prompt *prompt)
|
|
{
|
|
prompt->active = 1;
|
|
LogMaskLocal |= prompt->logmask;
|
|
}
|
|
|
|
static void
|
|
LogSetMaskLocal(void)
|
|
{
|
|
struct prompt *p;
|
|
|
|
LogMaskLocal = MSK(LogERROR) | MSK(LogALERT) | MSK(LogWARN);
|
|
for (p = promptlist; p; p = p->next)
|
|
LogMaskLocal |= p->logmask;
|
|
}
|
|
|
|
void
|
|
log_DeactivatePrompt(struct prompt *prompt)
|
|
{
|
|
if (prompt->active) {
|
|
prompt->active = 0;
|
|
LogSetMaskLocal();
|
|
}
|
|
}
|
|
|
|
void
|
|
log_UnRegisterPrompt(struct prompt *prompt)
|
|
{
|
|
if (prompt) {
|
|
struct prompt **p;
|
|
|
|
for (p = &promptlist; *p; p = &(*p)->next)
|
|
if (*p == prompt) {
|
|
*p = prompt->next;
|
|
prompt->next = NULL;
|
|
break;
|
|
}
|
|
LogSetMaskLocal();
|
|
log_PromptListChanged++;
|
|
}
|
|
}
|
|
|
|
void
|
|
log_DestroyPrompts(struct server *s)
|
|
{
|
|
struct prompt *p, *pn, *pl;
|
|
|
|
p = promptlist;
|
|
pl = NULL;
|
|
while (p) {
|
|
pn = p->next;
|
|
if (s && p->owner == s) {
|
|
if (pl)
|
|
pl->next = p->next;
|
|
else
|
|
promptlist = p->next;
|
|
p->next = NULL;
|
|
prompt_Destroy(p, 1);
|
|
} else
|
|
pl = p;
|
|
p = pn;
|
|
}
|
|
}
|
|
|
|
void
|
|
log_DisplayPrompts()
|
|
{
|
|
struct prompt *p;
|
|
|
|
for (p = promptlist; p; p = p->next)
|
|
prompt_Required(p);
|
|
}
|
|
|
|
void
|
|
log_WritePrompts(struct datalink *dl, const char *fmt,...)
|
|
{
|
|
va_list ap;
|
|
struct prompt *p;
|
|
|
|
va_start(ap, fmt);
|
|
for (p = promptlist; p; p = p->next)
|
|
if (prompt_IsTermMode(p, dl))
|
|
prompt_vPrintf(p, fmt, ap);
|
|
va_end(ap);
|
|
}
|
|
|
|
void
|
|
log_SetTtyCommandMode(struct datalink *dl)
|
|
{
|
|
struct prompt *p;
|
|
|
|
for (p = promptlist; p; p = p->next)
|
|
if (prompt_IsTermMode(p, dl))
|
|
prompt_TtyCommandMode(p);
|
|
}
|
|
|
|
static int
|
|
syslogLevel(int lev)
|
|
{
|
|
switch (lev) {
|
|
case LogDEBUG:
|
|
case LogTIMER:
|
|
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 *
|
|
log_Name(int id)
|
|
{
|
|
return id < LogMIN || id > LogMAX ? "Unknown" : LogNames[id - 1];
|
|
}
|
|
|
|
void
|
|
log_Keep(int id)
|
|
{
|
|
if (id >= LogMIN && id <= LogMAXCONF)
|
|
LogMask |= MSK(id);
|
|
}
|
|
|
|
void
|
|
log_KeepLocal(int id, u_long *mask)
|
|
{
|
|
if (id >= LogMIN && id <= LogMAXCONF) {
|
|
LogMaskLocal |= MSK(id);
|
|
*mask |= MSK(id);
|
|
}
|
|
}
|
|
|
|
void
|
|
log_Discard(int id)
|
|
{
|
|
if (id >= LogMIN && id <= LogMAXCONF)
|
|
LogMask &= ~MSK(id);
|
|
}
|
|
|
|
void
|
|
log_DiscardLocal(int id, u_long *mask)
|
|
{
|
|
if (id >= LogMIN && id <= LogMAXCONF) {
|
|
*mask &= ~MSK(id);
|
|
LogSetMaskLocal();
|
|
}
|
|
}
|
|
|
|
void
|
|
log_DiscardAll()
|
|
{
|
|
LogMask = 0;
|
|
}
|
|
|
|
void
|
|
log_DiscardAllLocal(u_long *mask)
|
|
{
|
|
*mask = MSK(LogERROR) | MSK(LogALERT) | MSK(LogWARN);
|
|
LogSetMaskLocal();
|
|
}
|
|
|
|
int
|
|
log_IsKept(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
|
|
log_IsKeptLocal(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
|
|
log_Open(const char *Name)
|
|
{
|
|
openlog(Name, LOG_PID, LOG_DAEMON);
|
|
}
|
|
|
|
void
|
|
log_SetTun(int tunno)
|
|
{
|
|
LogTunno = tunno;
|
|
}
|
|
|
|
void
|
|
log_Close()
|
|
{
|
|
closelog();
|
|
LogTunno = -1;
|
|
}
|
|
|
|
void
|
|
log_Printf(int lev, const char *fmt,...)
|
|
{
|
|
va_list ap;
|
|
struct prompt *prompt;
|
|
|
|
va_start(ap, fmt);
|
|
if (log_IsKept(lev)) {
|
|
char nfmt[200];
|
|
|
|
if ((log_IsKept(lev) & LOG_KEPT_LOCAL) && promptlist) {
|
|
if ((log_IsKept(LogTUN) & LOG_KEPT_LOCAL) && LogTunno != -1)
|
|
snprintf(nfmt, sizeof nfmt, "%s%d: %s: %s", TUN_NAME,
|
|
LogTunno, log_Name(lev), fmt);
|
|
else
|
|
snprintf(nfmt, sizeof nfmt, "%s: %s", log_Name(lev), fmt);
|
|
|
|
for (prompt = promptlist; prompt; prompt = prompt->next)
|
|
if (lev > LogMAXCONF || (prompt->logmask & MSK(lev)))
|
|
prompt_vPrintf(prompt, nfmt, ap);
|
|
}
|
|
|
|
if ((log_IsKept(lev) & LOG_KEPT_SYSLOG) &&
|
|
(lev != LogWARN || !promptlist)) {
|
|
if ((log_IsKept(LogTUN) & LOG_KEPT_SYSLOG) && LogTunno != -1)
|
|
snprintf(nfmt, sizeof nfmt, "%s%d: %s: %s", TUN_NAME,
|
|
LogTunno, log_Name(lev), fmt);
|
|
else
|
|
snprintf(nfmt, sizeof nfmt, "%s: %s", log_Name(lev), fmt);
|
|
vsyslog(syslogLevel(lev), nfmt, ap);
|
|
}
|
|
}
|
|
va_end(ap);
|
|
}
|
|
|
|
void
|
|
log_DumpBp(int lev, const char *hdr, const struct mbuf *bp)
|
|
{
|
|
if (log_IsKept(lev)) {
|
|
char buf[50];
|
|
char *b;
|
|
const u_char *ptr;
|
|
int f;
|
|
|
|
if (hdr && *hdr)
|
|
log_Printf(lev, "%s\n", hdr);
|
|
|
|
b = buf;
|
|
do {
|
|
f = bp->cnt;
|
|
ptr = CONST_MBUF_CTOP(bp);
|
|
while (f--) {
|
|
sprintf(b, " %02x", (int) *ptr++);
|
|
b += 3;
|
|
if (b == buf + sizeof buf - 2) {
|
|
strcpy(b, "\n");
|
|
log_Printf(lev, buf);
|
|
b = buf;
|
|
}
|
|
}
|
|
} while ((bp = bp->next) != NULL);
|
|
|
|
if (b > buf) {
|
|
strcpy(b, "\n");
|
|
log_Printf(lev, buf);
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
log_DumpBuff(int lev, const char *hdr, const u_char *ptr, int n)
|
|
{
|
|
if (log_IsKept(lev)) {
|
|
char buf[50];
|
|
char *b;
|
|
|
|
if (hdr && *hdr)
|
|
log_Printf(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");
|
|
log_Printf(lev, buf);
|
|
}
|
|
}
|
|
}
|
|
|
|
int
|
|
log_ShowLevel(struct cmdargs const *arg)
|
|
{
|
|
int i;
|
|
|
|
prompt_Printf(arg->prompt, "Log: ");
|
|
for (i = LogMIN; i <= LogMAX; i++)
|
|
if (log_IsKept(i) & LOG_KEPT_SYSLOG)
|
|
prompt_Printf(arg->prompt, " %s", log_Name(i));
|
|
|
|
prompt_Printf(arg->prompt, "\nLocal:");
|
|
for (i = LogMIN; i <= LogMAX; i++)
|
|
if (log_IsKeptLocal(i, arg->prompt->logmask) & LOG_KEPT_LOCAL)
|
|
prompt_Printf(arg->prompt, " %s", log_Name(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 - arg->argn;
|
|
argv = arg->argv + arg->argn;
|
|
res = 0;
|
|
|
|
if (argc == 0 || strcasecmp(argv[0], "local"))
|
|
local = 0;
|
|
else {
|
|
if (arg->prompt == NULL) {
|
|
log_Printf(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)
|
|
log_DiscardAllLocal(&arg->prompt->logmask);
|
|
else
|
|
log_DiscardAll();
|
|
}
|
|
|
|
while (argc--) {
|
|
argp = **argv == '+' || **argv == '-' ? *argv + 1 : *argv;
|
|
for (i = LogMIN; i <= LogMAX; i++)
|
|
if (strcasecmp(argp, log_Name(i)) == 0) {
|
|
if (**argv == '-') {
|
|
if (local)
|
|
log_DiscardLocal(i, &arg->prompt->logmask);
|
|
else
|
|
log_Discard(i);
|
|
} else if (local)
|
|
log_KeepLocal(i, &arg->prompt->logmask);
|
|
else
|
|
log_Keep(i);
|
|
break;
|
|
}
|
|
if (i > LogMAX) {
|
|
log_Printf(LogWARN, "%s: Invalid log value\n", argp);
|
|
res = -1;
|
|
}
|
|
argv++;
|
|
}
|
|
return res;
|
|
}
|
|
|
|
int
|
|
log_ShowWho(struct cmdargs const *arg)
|
|
{
|
|
struct prompt *p;
|
|
|
|
for (p = promptlist; p; p = p->next) {
|
|
prompt_Printf(arg->prompt, "%s (%s)", p->src.type, p->src.from);
|
|
if (p == arg->prompt)
|
|
prompt_Printf(arg->prompt, " *");
|
|
if (!p->active)
|
|
prompt_Printf(arg->prompt, " ^Z");
|
|
prompt_Printf(arg->prompt, "\n");
|
|
}
|
|
|
|
return 0;
|
|
}
|