94d661ac8c
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.
85 lines
1.9 KiB
C
85 lines
1.9 KiB
C
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/param.h>
|
|
#include <netinet/in.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <stdio.h>
|
|
#include <dlfcn.h>
|
|
#include "systems.h"
|
|
#include "mbuf.h"
|
|
#include "log.h"
|
|
#include "loadalias.h"
|
|
#include "vars.h"
|
|
|
|
#define _PATH_ALIAS "/usr/lib/libalias.so.2.1"
|
|
|
|
#define off(item) ((int)&(((struct aliasHandlers *)0)->item))
|
|
#define entry(a) { off(a), "_" #a }
|
|
|
|
static struct {
|
|
int offset;
|
|
char *name;
|
|
} map[] = {
|
|
entry(GetNextFragmentPtr),
|
|
entry(GetNextFragmentPtr),
|
|
entry(InitPacketAlias),
|
|
entry(PacketAliasIn),
|
|
entry(PacketAliasOut),
|
|
entry(PacketAliasRedirectAddr),
|
|
entry(PacketAliasRedirectPort),
|
|
entry(SaveFragmentPtr),
|
|
entry(SetPacketAliasAddress),
|
|
entry(SetPacketAliasMode),
|
|
entry(FragmentAliasIn),
|
|
{ 0, 0 }
|
|
};
|
|
|
|
static void *dl;
|
|
|
|
int loadAliasHandlers(struct aliasHandlers *h)
|
|
{
|
|
char *path;
|
|
char *env;
|
|
int i;
|
|
|
|
path = _PATH_ALIAS;
|
|
env = getenv("_PATH_ALIAS");
|
|
if (env)
|
|
if (OrigUid() == 0)
|
|
path = env;
|
|
else
|
|
LogPrintf(LogALERT, "Ignoring environment _PATH_ALIAS value (%s)",
|
|
env);
|
|
|
|
dl = dlopen(path, RTLD_LAZY);
|
|
if (dl == (void *)0) {
|
|
LogPrintf(LogWARN, "_PATH_ALIAS (%s): Invalid lib: %s\n",
|
|
path, dlerror());
|
|
return -1;
|
|
}
|
|
|
|
for (i = 0; map[i].name; i++) {
|
|
*(void **)((char *)h + map[i].offset) = dlsym(dl, map[i].name);
|
|
if (*(void **)((char *)h + map[i].offset) == (void *)0) {
|
|
LogPrintf(LogWARN, "_PATH_ALIAS (%s): %s: %s\n", path,
|
|
map[i].name, dlerror());
|
|
(void)dlclose(dl);
|
|
dl = (void *)0;
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
VarInitPacketAlias();
|
|
|
|
return 0;
|
|
}
|
|
|
|
void unloadAliasHandlers()
|
|
{
|
|
if (dl) {
|
|
dlclose(dl);
|
|
dl = (void *)0;
|
|
}
|
|
}
|