// 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.9 2004/06/28 02:43:13 fred_nerk Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.11 2004/07/07 09:09:53 bodea Exp $";
#include <arpa/inet.h>
#include <assert.h>
addr.sin_family = AF_INET;
addr.sin_port = htons(L2TPPORT);
addr.sin_addr.s_addr = config->bind_address;
- udpfd = socket(AF_INET, SOCK_DGRAM, UDP);
+ udpfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
setsockopt(udpfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
{
int flags = fcntl(udpfd, F_GETFL, 0);
log(0, 0, 0, 0, "Error in UDP bind: %s\n", strerror(errno));
exit(1);
}
- snoopfd = socket(AF_INET, SOCK_DGRAM, UDP);
+ snoopfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
snoop_addr.sin_family = AF_INET;
// Control
t = session[s].tunnel;
sp = &session[s];
+ log(5, session[s].ip, s, t, "Ethernet -> Tunnel (%d bytes)\n", len);
+
// Snooping this session, send it to intercept box
if (sp->snoop_ip && sp->snoop_port)
snoop_send_packet(buf, len, sp->snoop_ip, sp->snoop_port);
- log(5, session[s].ip, s, t, "Ethernet -> Tunnel (%d bytes)\n", len);
-
// Add on L2TP header
{
u8 *p = makeppp(b, sizeof(b), buf, len, t, s, PPPIP);
if (!r)
r = radiusnew(s);
+
if (radius[r].state != RADIUSIPCP)
{
radius[r].state = RADIUSIPCP;
radius[r].try = 0;
}
+
radius[r].retry = backoff(radius[r].try++);
if (radius[r].try > 10)
{
+ radiusclear(r, s); // Clear radius session.
sessionshutdown(s, "No reply on IPCP");
return;
}
sessionshutdown(s, reason); // close radius/routes, etc.
if (session[s].radius)
radiusclear(session[s].radius, 0); // cant send clean accounting data, session is killed
+
log(2, 0, s, session[s].tunnel, "Kill session %d (%s): %s\n", s, session[s].user, reason);
throttle_session(s, 0); // Force session to be un-throttle. Free'ing TBF structures.
// TBA - to send to RADIUS
break;
case 8: // vendor name
- memset(tunnel[t].vendor, 0, 128);
- memcpy(tunnel[t].vendor, b, (n >= 127) ? 127 : n);
+ memset(tunnel[t].vendor, 0, sizeof(tunnel[t].vendor));
+ memcpy(tunnel[t].vendor, b, (n >= sizeof(tunnel[t].vendor) - 1) ? sizeof(tunnel[t].vendor) - 1 : n);
log(4, ntohl(addr->sin_addr.s_addr), s, t, " Vendor name = \"%s\"\n", tunnel[t].vendor);
break;
case 9: // assigned tunnel
if (!(r = radiusnew(s)))
{
log(1, ntohl(addr->sin_addr.s_addr), s, t, "No free RADIUS sessions for ICRQ\n");
-// sessionkill(s, "no free RADIUS sesions");
+ sessionkill(s, "no free RADIUS sesions");
return;
}
} else
radius[r].retry = backoff(radius[r].try+1); // Is this really needed? --mo
}
- for (t = 1; t < config->cluster_highest_tunnelid; t++)
+ for (t = 1; t <= config->cluster_highest_tunnelid; t++)
{
// check for expired tunnels
if (tunnel[t].die && tunnel[t].die <= TIME)
int cn, i;
u8 buf[65536];
struct timeval to;
- time_t next_cluster_ping = 0; // default 1 second pings.
- clockt next_clean = time_now + config->cleanup_interval;
+ clockt next_cluster_ping = 0; // send initial ping immediately
+ time_t next_clean = time_now + config->cleanup_interval;
log(4, 0, 0, 0, "Beginning of main loop. udpfd=%d, tapfd=%d, cluster_sockfd=%d, controlfd=%d\n",
udpfd, tapfd, cluster_sockfd, controlfd);
}
// Runs on every machine (master and slaves).
- if (cluster_sockfd && next_cluster_ping <= time_now)
+ if (cluster_sockfd && next_cluster_ping <= TIME)
{
// Check to see which of the cluster is still alive..
- next_cluster_ping = time_now + 1;
cluster_send_ping(basetime);
-
cluster_check_master();
-
- cluster_heartbeat(config->cluster_highest_sessionid, sessionfree, config->cluster_highest_tunnelid); // Only does anything if we're a master.
+ cluster_heartbeat(); // Only does anything if we're a master.
master_update_counts(); // If we're a slave, send our byte counters to our master.
+ if (config->cluster_iam_master && !config->cluster_iam_uptodate)
+ next_cluster_ping = TIME + 1; // out-of-date slaves, do fast updates
+ else
+ next_cluster_ping = TIME + config->cluster_hb_interval;
}
// Run token bucket filtering queue..
}
// Are we the master and shutting down??
- if (config->cluster_iam_master) {
-
- cluster_heartbeat(config->cluster_highest_sessionid, sessionfree,
- config->cluster_highest_tunnelid); // Flush any queued changes..
- }
+ if (config->cluster_iam_master)
+ cluster_heartbeat(); // Flush any queued changes..
// Ok. Notify everyone we're shutting down. If we're
// the master, this will force an election.
ip_address_pool = mmap(NULL, sizeof(ippoolt) * MAXIPPOOL, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
if (ip_address_pool == MAP_FAILED)
{
- log(0, 0, 0, 0, "Error doing mmap for radius: %s\n", strerror(errno));
+ log(0, 0, 0, 0, "Error doing mmap for ip_address_pool: %s\n", strerror(errno));
exit(1);
}
#ifdef RINGBUFFER
ringbuffer = mmap(NULL, sizeof(struct Tringbuffer), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
if (ringbuffer == MAP_FAILED)
{
- log(0, 0, 0, 0, "Error doing mmap for radius: %s\n", strerror(errno));
+ log(0, 0, 0, 0, "Error doing mmap for ringbuffer: %s\n", strerror(errno));
exit(1);
}
memset(ringbuffer, 0, sizeof(struct Tringbuffer));
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);
{
u32 i;
int best = -1;
- clockt best_time = time_now;
+ time_t best_time = time_now;
char *u = session[s].user;
char reuse = 0;
config->debug++;
break;
case 'h':
- strncpy(hostname, optarg, 999);
+ snprintf(hostname, sizeof(hostname), "%s", optarg);
break;
case '?':
default:
initplugins();
initdata();
init_tbf();
- init_cli();
+ init_cli(hostname);
read_config_file();
log(0, 0, 0, 0, "L2TPNS version " VERSION "\n");
void update_config()
{
int i;
+ static int timeout = 0;
+ static int interval = 0;
// Update logging
closelog();
if (!config->cluster_hb_timeout)
config->cluster_hb_timeout = HB_TIMEOUT; // 10 missed heartbeat triggers an election.
+ if (interval != config->cluster_hb_interval || timeout != config->cluster_hb_timeout)
+ {
+ // Paranoia: cluster_check_master() treats 2 x interval + 1 sec as
+ // late, ensure we're sufficiently larger than that
+ int t = 4 * config->cluster_hb_interval + 11;
+
+ if (config->cluster_hb_timeout < t)
+ {
+ log(0,0,0,0, "Heartbeat timeout %d too low, adjusting to %d\n", config->cluster_hb_timeout, t);
+ config->cluster_hb_timeout = t;
+ }
+
+ // Push timing changes to the slaves immediately if we're the master
+ if (config->cluster_iam_master)
+ cluster_heartbeat();
+
+ interval = config->cluster_hb_interval;
+ timeout = config->cluster_hb_timeout;
+ }
+
config->reload_config = 0;
}
routeset(s, new->route[i].ip, new->route[i].mask, new->ip, 1);
}
-
-
if (new->tunnel && s > config->cluster_highest_sessionid) // Maintain this in the slave. It's used
// for walking the sessions to forward byte counts to the master.
config->cluster_highest_sessionid = s;
// Do fixups into address pool.
if (new->ip_pool_index != -1)
fix_address_pool(s);
+
return 1;
}
if (log_stream && config->debug >= 4)
{
- log(4, ntohl(addr->sin_addr.s_addr), 0, 0, "Received ");
+ log(4, ntohl(addr->sin_addr.s_addr), 0, 0, "Received ");
dump_packet(buf, log_stream);
}
int s;
run_plugins(PLUGIN_BECOME_MASTER, NULL);
- for (s = 0; s < config->cluster_highest_sessionid ; ++s) {
+ for (s = 1; s <= config->cluster_highest_sessionid ; ++s) {
if (!session[s].tunnel) // Not an in-use session.
continue;
time(&time_now);
for (i = 0; i < 64;++i) buckets[i] = 0;
- for (s = 0; s < config->cluster_highest_sessionid ; ++s) {
+ for (s = 1; s <= config->cluster_highest_sessionid ; ++s) {
int idle;
if (!session[s].tunnel)
continue;
time(&time_now);
for (i = 0; i < 64;++i) buckets[i] = 0;
- for (s = 0; s < config->cluster_highest_sessionid ; ++s) {
+ for (s = 1; s <= config->cluster_highest_sessionid ; ++s) {
int open = 0, d;
if (!session[s].tunnel)
continue;
projects / l2tpns.git / blobdiff