// Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
// vim: sw=8 ts=8
-char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.27 2004/09/19 23:26:46 fred_nerk Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.33 2004/10/28 03:58:38 bodea Exp $";
#include <arpa/inet.h>
#include <assert.h>
int *radfds = NULL; // RADIUS requests file handles
int ifrfd = -1; // File descriptor for routing, etc
time_t basetime = 0; // base clock
-char *hostname = NULL; // us.
+char hostname[1000] = ""; // us.
int tunidx; // ifr_ifindex of tun device
u32 sessionid = 0; // session id for radius accounting
int syslog_log = 0; // are we logging to syslog
CONFIG("debug", debug, INT),
CONFIG("log_file", log_filename, STRING),
CONFIG("pid_file", pid_file, STRING),
- CONFIG("hostname", hostname, STRING),
CONFIG("l2tp_secret", l2tpsecret, STRING),
CONFIG("primary_dns", default_dns1, IP),
CONFIG("secondary_dns", default_dns2, IP),
}
}
- if (config->accounting_dir && next_acct <= TIME)
+ if (*config->accounting_dir && next_acct <= TIME)
{
// Dump accounting data
next_acct = TIME + ACCT_TIME;
for (i = 0; i < config->num_radfds; i++)
if (FD_ISSET(radfds[i], &r))
processrad(buf, recv(radfds[i], buf, sizeof(buf), 0), i);
+
if (FD_ISSET(cluster_sockfd, &r))
{
int size;
size = recvfrom(cluster_sockfd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen);
processcluster(buf, size, addr.sin_addr.s_addr);
}
+
if (FD_ISSET(controlfd, &r))
processcontrol(buf, recvfrom(controlfd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen), &addr);
+
if (FD_ISSET(clifd, &r))
{
struct sockaddr_in addr;
}
// Init data structures
-void initdata(void)
+void initdata(int optdebug, char *optconfig)
{
int i;
- char *p;
- if ((_statistics = shared_malloc(sizeof(struct Tstats))) == MAP_FAILED)
+ if (!(_statistics = shared_malloc(sizeof(struct Tstats))))
{
log(0, 0, 0, 0, "Error doing malloc for _statistics: %s\n", strerror(errno));
exit(1);
}
- if ((config = shared_malloc(sizeof(struct configt))) == MAP_FAILED)
+ if (!(config = shared_malloc(sizeof(struct configt))))
{
log(0, 0, 0, 0, "Error doing malloc for configuration: %s\n", strerror(errno));
exit(1);
}
memset(config, 0, sizeof(struct configt));
time(&config->start_time);
- strncpy(config->config_file, CONFIGFILE, sizeof(config->config_file) - 1);
- if ((tunnel = shared_malloc(sizeof(tunnelt) * MAXTUNNEL)) == MAP_FAILED);
+ config->debug = optdebug;
+ strncpy(config->config_file, optconfig, strlen(optconfig));
+ if (!(tunnel = shared_malloc(sizeof(tunnelt) * MAXTUNNEL)))
{
log(0, 0, 0, 0, "Error doing malloc for tunnels: %s\n", strerror(errno));
exit(1);
}
- if ((session = shared_malloc(sizeof(sessiont) * MAXSESSION)) == MAP_FAILED)
+ if (!(session = shared_malloc(sizeof(sessiont) * MAXSESSION)))
{
log(0, 0, 0, 0, "Error doing malloc for sessions: %s\n", strerror(errno));
exit(1);
}
- if ((sess_count = shared_malloc(sizeof(sessioncountt) * MAXSESSION)) == MAP_FAILED)
+ if (!(sess_count = shared_malloc(sizeof(sessioncountt) * MAXSESSION)))
{
log(0, 0, 0, 0, "Error doing malloc for sessions_count: %s\n", strerror(errno));
exit(1);
}
- if ((radius = shared_malloc(sizeof(radiust) * MAXRADIUS)) == MAP_FAILED)
+ if (!(radius = shared_malloc(sizeof(radiust) * MAXRADIUS)))
{
log(0, 0, 0, 0, "Error doing malloc for radius: %s\n", strerror(errno));
exit(1);
}
- if ((ip_address_pool = shared_malloc(sizeof(ippoolt) * MAXIPPOOL)) == MAP_FAILED)
+ if (!(ip_address_pool = shared_malloc(sizeof(ippoolt) * MAXIPPOOL)))
{
log(0, 0, 0, 0, "Error doing malloc for ip_address_pool: %s\n", strerror(errno));
exit(1);
}
#ifdef RINGBUFFER
- if ((ringbuffer = shared_malloc(sizeof(struct Tringbuffer))) == MAP_FAILED)
+ if (!(ringbuffer = shared_malloc(sizeof(struct Tringbuffer))))
{
log(0, 0, 0, 0, "Error doing malloc for ringbuffer: %s\n", strerror(errno));
exit(1);
memset(ringbuffer, 0, sizeof(struct Tringbuffer));
#endif
- if ((cli_session_actions = shared_malloc(sizeof(struct cli_session_actions) * MAXSESSION))
- == MAP_FAILED)
+ if (!(cli_session_actions = shared_malloc(sizeof(struct cli_session_actions) * MAXSESSION)))
{
log(0, 0, 0, 0, "Error doing malloc for cli session actions: %s\n", strerror(errno));
exit(1);
}
memset(cli_session_actions, 0, sizeof(struct cli_session_actions) * MAXSESSION);
- if ((cli_tunnel_actions = shared_malloc(sizeof(struct cli_tunnel_actions) * MAXSESSION))
- == MAP_FAILED)
+ if (!(cli_tunnel_actions = shared_malloc(sizeof(struct cli_tunnel_actions) * MAXSESSION)))
{
log(0, 0, 0, 0, "Error doing malloc for cli tunnel actions: %s\n", strerror(errno));
exit(1);
for (i = 1; i < MAXTUNNEL- 1; i++)
tunnel[i].state = TUNNELUNDEF; // mark it as not filled in.
- // Grab my hostname unless it's been specified
- gethostname(config->hostname, sizeof(config->hostname));
- if ((p = strchr(config->hostname, '.'))) *p = 0;
- hostname = config->hostname;
+ if (!*hostname)
+ {
+ char *p;
+ // Grab my hostname unless it's been specified
+ gethostname(hostname, sizeof(hostname));
+ if ((p = strchr(hostname, '.'))) *p = 0;
+ }
_statistics->start_time = _statistics->last_reset = time(NULL);
#ifdef BGP
- if ((bgp_peers = shared_malloc(sizeof(struct bgp_peer) * BGP_NUM_PEERS)) == MAP_FAILED)
+ if (!(bgp_peers = shared_malloc(sizeof(struct bgp_peer) * BGP_NUM_PEERS)))
{
log(0, 0, 0, 0, "Error doing malloc for bgp: %s\n", strerror(errno));
exit(1);
for (i = 0; i < MAXSESSION; i++)
{
- if (!session[i].opened || !session[i].ip || !session[i].cin || !session[i].cout || !*session[i].user || session[i].walled_garden)
+ if (!session[i].opened || !session[i].ip || (!session[i].cin && !session[i].cout) || !*session[i].user || session[i].walled_garden)
continue;
if (!f)
{
{
int o;
int optdebug = 0;
+ char *optconfig = CONFIGFILE;
_program_name = strdup(argv[0]);
time(&basetime); // start clock
// scan args
- while ((o = getopt(argc, argv, "vc:h:a:")) >= 0)
+ while ((o = getopt(argc, argv, "dvc:h:")) >= 0)
{
switch (o)
{
case 'v':
optdebug++;
break;
+ case 'c':
+ optconfig = optarg;
+ break;
case 'h':
snprintf(hostname, sizeof(hostname), "%s", optarg);
break;
- case '?':
default:
printf("Args are:\n"
"\t-d\tDetach from terminal\n"
initiptables();
initplugins();
- initdata();
-
- config->debug = optdebug;
+ initdata(optdebug, optconfig);
init_tbf();
- init_cli();
+ init_cli(hostname);
read_config_file();
log(0, 0, 0, 0, "L2TPNS version " VERSION "\n");
CSTAT(call_sessionsetup);
-
log(3, session[s].ip, s, t, "Doing session setup for session\n");
if (!session[s].ip || session[s].ip == 0xFFFFFFFE)
log(3, 0, s, t, " No IP allocated. Assigned %s from pool\n",
inet_toa(htonl(session[s].ip)));
else
+ {
log(0, 0, s, t, " No IP allocated. The IP address pool is FULL!\n");
+ sessionshutdown(s, "No IP addresses available");
+ return 0;
+ }
}
projects / l2tpns.git / blobdiff