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.
213 lines
5.0 KiB
C
213 lines
5.0 KiB
C
#include <limits.h>
|
|
#include <netdb.h>
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
#include <netinet/in.h>
|
|
#include <arpa/inet.h>
|
|
|
|
#include "defs.h"
|
|
#include "command.h"
|
|
#include "loadalias.h"
|
|
#include "vars.h"
|
|
|
|
static int
|
|
StrToAddr (char *, struct in_addr* addr);
|
|
|
|
static int
|
|
StrToPort (char *, u_short *port, char *proto);
|
|
|
|
static int
|
|
StrToAddrAndPort (char *, struct in_addr *addr, u_short *port, char *proto);
|
|
|
|
|
|
int
|
|
AliasRedirectPort (struct cmdtab *list,
|
|
int argc,
|
|
char **argv,
|
|
void *param)
|
|
{
|
|
if (!(mode & MODE_ALIAS)) {
|
|
if (VarTerm)
|
|
fprintf(VarTerm, "Alias not enabled\n");
|
|
} else if (argc == 3) {
|
|
char proto_constant;
|
|
char *proto;
|
|
u_short local_port;
|
|
u_short alias_port;
|
|
int error;
|
|
struct in_addr local_addr;
|
|
struct in_addr null_addr;
|
|
struct alias_link *link;
|
|
|
|
proto = argv[0];
|
|
if (strcmp(proto, "tcp") == 0) {
|
|
proto_constant = IPPROTO_TCP;
|
|
} else if (strcmp(proto, "udp") == 0) {
|
|
proto_constant = IPPROTO_UDP;
|
|
} else {
|
|
if (VarTerm) {
|
|
fprintf(VarTerm, "port redirect: protocol must be tcp or udp\n");
|
|
fprintf(VarTerm, "Usage: alias %s %s\n", list->name,
|
|
list->syntax);
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
error = StrToAddrAndPort(argv[1], &local_addr, &local_port, proto);
|
|
if (error) {
|
|
if (VarTerm) {
|
|
fprintf(VarTerm, "port redirect: error reading local addr:port\n");
|
|
fprintf(VarTerm, "Usage: alias %s %s\n", list->name, list->syntax);
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
error = StrToPort(argv[2], &alias_port, proto);
|
|
if (error) {
|
|
if (VarTerm) {
|
|
fprintf(VarTerm, "port redirect: error reading alias port\n");
|
|
fprintf(VarTerm, "Usage: alias %s %s\n", list->name, list->syntax);
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
null_addr.s_addr = 0;
|
|
|
|
link = VarPacketAliasRedirectPort(local_addr, local_port,
|
|
null_addr, 0,
|
|
null_addr, alias_port,
|
|
proto_constant);
|
|
|
|
if (link == NULL && VarTerm)
|
|
fprintf(VarTerm, "port redirect: error returned by packed"
|
|
" aliasing engine (code=%d)\n", error);
|
|
} else if (VarTerm)
|
|
fprintf(VarTerm, "Usage: alias %s %s\n", list->name, list->syntax);
|
|
|
|
return 1;
|
|
}
|
|
|
|
|
|
int
|
|
AliasRedirectAddr(struct cmdtab *list,
|
|
int argc,
|
|
char **argv,
|
|
void *param)
|
|
{
|
|
if (!(mode & MODE_ALIAS)) {
|
|
if (VarTerm)
|
|
fprintf(VarTerm, "alias not enabled\n");
|
|
} else if (argc == 2) {
|
|
int error;
|
|
struct in_addr local_addr;
|
|
struct in_addr alias_addr;
|
|
struct alias_link *link;
|
|
|
|
error = StrToAddr(argv[0], &local_addr);
|
|
if (error) {
|
|
if (VarTerm)
|
|
fprintf(VarTerm, "address redirect: invalid local address\n");
|
|
return 1;
|
|
}
|
|
|
|
error = StrToAddr(argv[1], &alias_addr);
|
|
if (error) {
|
|
if (VarTerm) {
|
|
fprintf(VarTerm, "address redirect: invalid alias address\n");
|
|
fprintf(VarTerm, "Usage: alias %s %s\n", list->name, list->syntax);
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
link = VarPacketAliasRedirectAddr(local_addr, alias_addr);
|
|
if (link == NULL && VarTerm) {
|
|
fprintf(VarTerm, "address redirect: packet aliasing engine error\n");
|
|
fprintf(VarTerm, "Usage: alias %s %s\n", list->name, list->syntax);
|
|
}
|
|
} else if (VarTerm)
|
|
fprintf(VarTerm, "Usage: alias %s %s\n", list->name, list->syntax);
|
|
|
|
return 1;
|
|
}
|
|
|
|
|
|
static int
|
|
StrToAddr (char* str,
|
|
struct in_addr* addr)
|
|
{
|
|
struct hostent* hp;
|
|
|
|
if (inet_aton (str, addr))
|
|
return 0;
|
|
|
|
hp = gethostbyname (str);
|
|
if (!hp)
|
|
{
|
|
LogPrintf(LogWARN, "StrToAddr: Unknown host %s.\n", str);
|
|
return -1;
|
|
}
|
|
|
|
*addr = *((struct in_addr *) hp->h_addr);
|
|
return 0;
|
|
}
|
|
|
|
|
|
static int
|
|
StrToPort (char *str,
|
|
u_short *port,
|
|
char *proto)
|
|
{
|
|
int iport;
|
|
struct servent* sp;
|
|
char* end;
|
|
|
|
iport = strtol (str, &end, 10);
|
|
if (end != str)
|
|
{
|
|
*port = htons(iport);
|
|
return 0;
|
|
}
|
|
|
|
sp = getservbyname (str, proto);
|
|
if (!sp)
|
|
{
|
|
LogPrintf(LogWARN, "StrToAddr: Unknown port or service %s/%s.\n",
|
|
str, proto);
|
|
return -1;
|
|
}
|
|
|
|
*port = sp->s_port;
|
|
return 0;
|
|
}
|
|
|
|
|
|
int
|
|
StrToAddrAndPort (char* str,
|
|
struct in_addr* addr,
|
|
u_short *port,
|
|
char *proto)
|
|
{
|
|
char *ptr;
|
|
|
|
ptr = strchr (str, ':');
|
|
if (!ptr)
|
|
{
|
|
LogPrintf(LogWARN, "StrToAddrAndPort: %s is missing port number.\n",
|
|
str);
|
|
return -1;
|
|
}
|
|
|
|
*ptr = '\0';
|
|
++ptr;
|
|
|
|
if (StrToAddr (str, addr) != 0)
|
|
return -1;
|
|
|
|
return StrToPort (ptr, port, proto);
|
|
}
|
|
|