// 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.26 2004/09/19 23:19:23 fred_nerk Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.44 2004/11/05 04:55:27 bodea Exp $";
#include <arpa/inet.h>
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
+#include <ctype.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/stat.h>
CONFIG("save_state", save_state, BOOL),
CONFIG("primary_radius", radiusserver[0], IP),
CONFIG("secondary_radius", radiusserver[1], IP),
- CONFIG("primary_radius_port",radiusport[0], SHORT),
- CONFIG("secondary_radius_port",radiusport[1], SHORT),
+ CONFIG("primary_radius_port", radiusport[0], SHORT),
+ CONFIG("secondary_radius_port", radiusport[1], SHORT),
CONFIG("radius_accounting", radius_accounting, BOOL),
CONFIG("radius_secret", radiussecret, STRING),
CONFIG("bind_address", bind_address, IP),
+ CONFIG("peer_address", peer_address, IP),
CONFIG("send_garp", send_garp, BOOL),
CONFIG("throttle_speed", rl_rate, UNSIGNED_LONG),
+ CONFIG("throttle_buckets", num_tbfs, INT),
CONFIG("accounting_dir", accounting_dir, STRING),
CONFIG("setuid", target_uid, INT),
CONFIG("dump_speed", dump_speed, BOOL),
//
-// Log a debug message.
+// Log a debug message. Typically called vias LOG macro
//
void _log(int level, ipt address, sessionidt s, tunnelidt t, const char *format, ...)
{
va_end(ap);
}
-void _log_hex(int level, ipt address, sessionidt s, tunnelidt t, const char *title, const char *data, int maxsize)
+void _log_hex(int level, const char *title, const char *data, int maxsize)
{
int i, j;
const u8 *d = (const u8 *)data;
if (config->debug < level) return;
- // No support for log_hex to syslog
+ // No support for _log_hex to syslog
if (log_stream)
{
- log(level, address, s, t, "%s (%d bytes):\n", title, maxsize);
+ _log(level, 0, 0, 0, "%s (%d bytes):\n", title, maxsize);
setvbuf(log_stream, NULL, _IOFBF, 16384);
for (i = 0; i < maxsize; )
else if (mask == 0xffffffff)
r.rt_flags |= RTF_HOST;
- log(1, ip, 0, 0, "Route %s %u.%u.%u.%u/%u.%u.%u.%u %u.%u.%u.%u\n",
+ LOG(1, ip, 0, 0, "Route %s %u.%u.%u.%u/%u.%u.%u.%u %u.%u.%u.%u\n",
add ? "add" : "del",
ip >> 24, ip >> 16 & 0xff, ip >> 8 & 0xff, ip & 0xff,
mask >> 24, mask >> 16 & 0xff, mask >> 8 & 0xff, mask & 0xff,
gw >> 24, gw >> 16 & 0xff, gw >> 8 & 0xff, gw & 0xff);
if (ioctl(ifrfd, add ? SIOCADDRT : SIOCDELRT, (void *) &r) < 0)
- log(0, 0, 0, 0, "routeset() error in ioctl: %s\n", strerror(errno));
+ LOG(0, 0, 0, 0, "routeset() error in ioctl: %s\n", strerror(errno));
#ifdef BGP
if (add)
tunfd = open(TUNDEVICE, O_RDWR);
if (tunfd < 0)
{ // fatal
- log(0, 0, 0, 0, "Can't open %s: %s\n", TUNDEVICE, strerror(errno));
+ LOG(0, 0, 0, 0, "Can't open %s: %s\n", TUNDEVICE, strerror(errno));
exit(1);
}
{
}
if (ioctl(tunfd, TUNSETIFF, (void *) &ifr) < 0)
{
- log(0, 0, 0, 0, "Can't set tun interface: %s\n", strerror(errno));
+ LOG(0, 0, 0, 0, "Can't set tun interface: %s\n", strerror(errno));
exit(1);
}
assert(strlen(ifr.ifr_name) < sizeof(config->tundevice));
if (ioctl(ifrfd, SIOCSIFADDR, (void *) &ifr) < 0)
{
- log(0, 0, 0, 0, "Error setting tun address: %s\n", strerror(errno));
+ LOG(0, 0, 0, 0, "Error setting tun address: %s\n", strerror(errno));
exit(1);
}
/* Bump up the qlen to deal with bursts from the network */
ifr.ifr_qlen = 1000;
if (ioctl(ifrfd, SIOCSIFTXQLEN, (void *) &ifr) < 0)
{
- log(0, 0, 0, 0, "Error setting tun queue length: %s\n", strerror(errno));
+ LOG(0, 0, 0, 0, "Error setting tun queue length: %s\n", strerror(errno));
exit(1);
}
ifr.ifr_flags = IFF_UP;
if (ioctl(ifrfd, SIOCSIFFLAGS, (void *) &ifr) < 0)
{
- log(0, 0, 0, 0, "Error setting tun flags: %s\n", strerror(errno));
+ LOG(0, 0, 0, 0, "Error setting tun flags: %s\n", strerror(errno));
exit(1);
}
if (ioctl(ifrfd, SIOCGIFINDEX, (void *) &ifr) < 0)
{
- log(0, 0, 0, 0, "Error setting tun ifindex: %s\n", strerror(errno));
+ LOG(0, 0, 0, 0, "Error setting tun ifindex: %s\n", strerror(errno));
exit(1);
}
tunidx = ifr.ifr_ifindex;
}
if (bind(udpfd, (void *) &addr, sizeof(addr)) < 0)
{
- log(0, 0, 0, 0, "Error in UDP bind: %s\n", strerror(errno));
+ LOG(0, 0, 0, 0, "Error in UDP bind: %s\n", strerror(errno));
exit(1);
}
snoopfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
setsockopt(controlfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
if (bind(controlfd, (void *) &addr, sizeof(addr)) < 0)
{
- log(0, 0, 0, 0, "Error in control bind: %s\n", strerror(errno));
+ LOG(0, 0, 0, 0, "Error in control bind: %s\n", strerror(errno));
exit(1);
}
}
d[(size_t) a[3]] = (char *)((int)s);
if (s > 0)
- log(4, ip, s, session[s].tunnel, "Caching ip address %s\n", inet_toa(nip));
+ LOG(4, ip, s, session[s].tunnel, "Caching ip address %s\n", inet_toa(nip));
else if (s == 0)
- log(4, ip, 0, 0, "Un-caching ip address %s\n", inet_toa(nip));
+ LOG(4, ip, 0, 0, "Un-caching ip address %s\n", inet_toa(nip));
// else a map to an ip pool index.
}
s = socket(PF_INET, SOCK_DGRAM, 0);
if (s < 0)
{
- log(0, 0, 0, 0, "Error creating socket for GARP: %s\n", strerror(errno));
+ LOG(0, 0, 0, 0, "Error creating socket for GARP: %s\n", strerror(errno));
return;
}
memset(&ifr, 0, sizeof(ifr));
strncpy(ifr.ifr_name, "eth0", sizeof(ifr.ifr_name) - 1);
if (ioctl(s, SIOCGIFHWADDR, &ifr) < 0)
{
- log(0, 0, 0, 0, "Error getting eth0 hardware address for GARP: %s\n", strerror(errno));
+ LOG(0, 0, 0, 0, "Error getting eth0 hardware address for GARP: %s\n", strerror(errno));
close(s);
return;
}
memcpy(mac, &ifr.ifr_hwaddr.sa_data, 6*sizeof(char));
if (ioctl(s, SIOCGIFINDEX, &ifr) < 0)
{
- log(0, 0, 0, 0, "Error getting eth0 interface index for GARP: %s\n", strerror(errno));
+ LOG(0, 0, 0, 0, "Error getting eth0 interface index for GARP: %s\n", strerror(errno));
close(s);
return;
}
if (!t)
{
static int backtrace_count = 0;
- log(0, 0, 0, t, "tunnelsend called with 0 as tunnel id\n");
+ LOG(0, 0, 0, t, "tunnelsend called with 0 as tunnel id\n");
STAT(tunnel_tx_errors);
log_backtrace(backtrace_count, 5)
return;
if (!tunnel[t].ip)
{
static int backtrace_count = 0;
- log(1, 0, 0, t, "Error sending data out tunnel: no remote endpoint (tunnel not set up)\n");
+ LOG(1, 0, 0, t, "Error sending data out tunnel: no remote endpoint (tunnel not set up)\n");
log_backtrace(backtrace_count, 5)
STAT(tunnel_tx_errors);
return;
if (tunnel[t].try > 1)
{
STAT(tunnel_retries);
- log(3, tunnel[t].ip, 0, t, "Control message resend try %d\n", tunnel[t].try);
+ LOG(3, tunnel[t].ip, 0, t, "Control message resend try %d\n", tunnel[t].try);
}
}
if (sendto(udpfd, buf, l, 0, (void *) &addr, sizeof(addr)) < 0)
{
- log(0, tunnel[t].ip, ntohs((*(u16 *) (buf + 6))), t, "Error sending data out tunnel: %s (udpfd=%d, buf=%p, len=%d, dest=%s)\n",
+ LOG(0, tunnel[t].ip, ntohs((*(u16 *) (buf + 6))), t, "Error sending data out tunnel: %s (udpfd=%d, buf=%p, len=%d, dest=%s)\n",
strerror(errno), udpfd, buf, l, inet_ntoa(addr.sin_addr));
STAT(tunnel_tx_errors);
return;
}
- log_hex(5, "Send Tunnel Data", buf, l);
+ LOG_HEX(5, "Send Tunnel Data", buf, l);
STAT(tunnel_tx_packets);
INC_STAT(tunnel_tx_bytes, l);
}
if (len < MIN_IP_SIZE)
{
- log(1, 0, 0, 0, "Short IP, %d bytes\n", len);
+ LOG(1, 0, 0, 0, "Short IP, %d bytes\n", len);
STAT(tunnel_tx_errors);
return;
}
if (len >= MAXETHER)
{
- log(1, 0, 0, 0, "Oversize IP packet %d bytes\n", len);
+ LOG(1, 0, 0, 0, "Oversize IP packet %d bytes\n", len);
STAT(tunnel_tx_errors);
return;
}
// Got an IP header now
if (*(u8 *)(buf) >> 4 != 4)
{
- log(1, 0, 0, 0, "IP: Don't understand anything except IPv4\n");
+ LOG(1, 0, 0, 0, "IP: Don't understand anything except IPv4\n");
return;
}
if (rate++ < config->icmp_rate) // Only send a max of icmp_rate per second.
{
- log(4, 0, 0, 0, "IP: Sending ICMP host unreachable to %s\n", inet_toa(*(u32 *)(buf + 12)));
+ LOG(4, 0, 0, 0, "IP: Sending ICMP host unreachable to %s\n", inet_toa(*(u32 *)(buf + 12)));
host_unreachable(*(u32 *)(buf + 12), *(u16 *)(buf + 4), ip, buf, (len < 64) ? 64 : len);
}
return;
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);
+ 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 (!p)
{
- log(3, session[s].ip, s, t, "failed to send packet in processipout.\n");
+ LOG(3, session[s].ip, s, t, "failed to send packet in processipout.\n");
return;
}
tunnelsend(b, len + (p-b), t); // send it...
if (len < 0 || len > MAXETHER)
{
- log(1,0,0,0, "Odd size IP packet: %d bytes\n", len);
+ LOG(1,0,0,0, "Odd size IP packet: %d bytes\n", len);
return;
}
t = session[s].tunnel;
sp = &session[s];
- log(5, session[s].ip, s, t, "Ethernet -> Tunnel (%d bytes)\n", len);
+ LOG(5, session[s].ip, s, t, "Ethernet -> Tunnel (%d bytes)\n", len);
// Snooping this session.
if (sp->snoop_ip && sp->snoop_port)
u8 *p = makeppp(b, sizeof(b), buf, len, t, s, PPPIP);
if (!p)
{
- log(3, session[s].ip, s, t, "failed to send packet in send_ipout.\n");
+ LOG(3, session[s].ip, s, t, "failed to send packet in send_ipout.\n");
return;
}
tunnelsend(b, len + (p-b), t); // send it...
//
// Throttle or Unthrottle a session
//
-// Throttle the data folling through a session
-// to be no more than 'throttle' kbit/sec each way.
+// Throttle the data from/to through a session to no more than
+// 'rate_in' kbit/sec in (from user) or 'rate_out' kbit/sec out (to
+// user).
//
-int throttle_session(sessionidt s, int throttle)
+// If either value is -1, the current value is retained for that
+// direction.
+//
+void throttle_session(sessionidt s, int rate_in, int rate_out)
{
if (!session[s].tunnel)
- return 0; // No-one home.
+ return; // No-one home.
if (!*session[s].user)
- return 0; // User not logged in
+ return; // User not logged in
- if (throttle)
+ if (rate_in >= 0)
{
- int rate_in = throttle & 0x0000FFFF;
- int rate_out = throttle >> 16;
-
- if (session[s].tbf_in || session[s].tbf_out)
- {
- if (throttle == session[s].throttle)
- return 1;
-
- // Currently throttled but the rate is changing.
-
+ int bytes = rate_in * 1024 / 8; // kbits to bytes
+ if (session[s].tbf_in)
free_tbf(session[s].tbf_in);
- free_tbf(session[s].tbf_out);
- }
- if (rate_in) session[s].tbf_in = new_tbf(s, rate_in * 1024 / 4, rate_in * 1024 / 8, send_ipin);
- if (rate_out) session[s].tbf_out = new_tbf(s, rate_out * 1024 / 4, rate_out * 1024 / 8, send_ipout);
-
- if (throttle != session[s].throttle)
- {
- // Changed. Flood to slaves.
- session[s].throttle = throttle;
- cluster_send_session(s);
- }
+ if (rate_in > 0)
+ session[s].tbf_in = new_tbf(s, bytes * 2, bytes, send_ipin);
+ else
+ session[s].tbf_in = 0;
- return 1;
+ session[s].throttle_in = rate_in;
}
- // else Unthrottling.
-
- if (!session[s].tbf_in && !session[s].tbf_out && !session[s].throttle)
- return 0;
-
- free_tbf(session[s].tbf_in);
- session[s].tbf_in = 0;
+ if (rate_out >= 0)
+ {
+ int bytes = rate_out * 1024 / 8;
+ if (session[s].tbf_out)
+ free_tbf(session[s].tbf_out);
- free_tbf(session[s].tbf_out);
- session[s].tbf_out = 0;
+ if (rate_out > 0)
+ session[s].tbf_out = new_tbf(s, bytes * 2, bytes, send_ipout);
+ else
+ session[s].tbf_out = 0;
- if (throttle != session[s].throttle)
- {
- // Changed. Flood to slaves.
- session[s].throttle = throttle;
- cluster_send_session(s);
+ session[s].throttle_out = rate_out;
}
-
- return 0;
}
// start tidy shutdown of session
if (!session[s].tunnel)
{
- log(3, session[s].ip, s, session[s].tunnel, "Called sessionshutdown on a session with no tunnel.\n");
+ LOG(3, session[s].ip, s, session[s].tunnel, "Called sessionshutdown on a session with no tunnel.\n");
return; // not a live session
}
if (!dead)
- log(2, 0, s, session[s].tunnel, "Shutting down session %d: %s\n", s, reason);
+ LOG(2, 0, s, session[s].tunnel, "Shutting down session %d: %s\n", s, reason);
session[s].die = now() + 150; // Clean up in 15 seconds
{
if (!(r = radiusnew(s)))
{
- log(1, 0, s, session[s].tunnel, "No free RADIUS sessions for Stop message\n");
+ LOG(1, 0, s, session[s].tunnel, "No free RADIUS sessions for Stop message\n");
STAT(radius_overflow);
}
else
}
else
free_ip_address(s);
-
- if (session[s].throttle) // Unthrottle if throttled.
- throttle_session(s, 0);
}
+
+ if (session[s].throttle_in || session[s].throttle_out) // Unthrottle if throttled.
+ throttle_session(s, 0, 0);
+
{ // Send CDN
controlt *c = controlnew(14); // sending CDN
control16(c, 1, 3, 1); // result code (admin reasons - TBA make error, general error, add message
control16(c, 14, s, 1); // assigned session (our end)
controladd(c, session[s].tunnel, s); // send the message
}
+
cluster_send_session(s);
}
q = makeppp(buf,sizeof(buf), 0, 0, t, s, PPPIPCP);
if (!q)
{
- log(3, session[s].ip, s, t, "failed to send packet in sendipcp.\n");
+ LOG(3, session[s].ip, s, t, "failed to send packet in sendipcp.\n");
return;
}
*(u16 *) (q + 2) = htons(10);
q[4] = 3;
q[5] = 6;
- *(u32 *) (q + 6) = config->bind_address ? config->bind_address : my_address; // send my IP
+ *(u32 *) (q + 6) = config->peer_address ? config->peer_address :
+ config->bind_address ? config->bind_address :
+ my_address; // send my IP
+
tunnelsend(buf, 10 + (q - buf), t); // send it
session[s].flags &= ~SF_IPCP_ACKED; // Clear flag.
}
if (session[s].radius)
radiusclear(session[s].radius, s); // 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.
+ LOG(2, 0, s, session[s].tunnel, "Kill session %d (%s): %s\n", s, session[s].user, reason);
memset(&session[s], 0, sizeof(session[s]));
session[s].tunnel = T_FREE; // Mark it as free.
// free tunnel
tunnelclear(t);
- log(1, 0, 0, t, "Kill tunnel %d: %s\n", t, reason);
+ LOG(1, 0, 0, t, "Kill tunnel %d: %s\n", t, reason);
cli_tunnel_actions[s].action = 0;
cluster_send_tunnel(t);
}
tunnelkill(t, reason);
return;
}
- log(1, 0, 0, t, "Shutting down tunnel %d (%s)\n", t, reason);
+ LOG(1, 0, 0, t, "Shutting down tunnel %d (%s)\n", t, reason);
// close session
for (s = 1; s < MAXSESSION; s++)
udp_rx += len;
udp_rx_pkt++;
- log_hex(5, "UDP Data", buf, len);
+ LOG_HEX(5, "UDP Data", buf, len);
STAT(tunnel_rx_packets);
INC_STAT(tunnel_rx_bytes, len);
if (len < 6)
{
- log(1, ntohl(addr->sin_addr.s_addr), 0, 0, "Short UDP, %d bytes\n", len);
+ LOG(1, ntohl(addr->sin_addr.s_addr), 0, 0, "Short UDP, %d bytes\n", len);
STAT(tunnel_rx_errors);
return;
}
if ((buf[1] & 0x0F) != 2)
{
- log(1, ntohl(addr->sin_addr.s_addr), 0, 0, "Bad L2TP ver %d\n", (buf[1] & 0x0F) != 2);
+ LOG(1, ntohl(addr->sin_addr.s_addr), 0, 0, "Bad L2TP ver %d\n", (buf[1] & 0x0F) != 2);
STAT(tunnel_rx_errors);
return;
}
p += 2;
if (s >= MAXSESSION)
{
- log(1, ntohl(addr->sin_addr.s_addr), s, t, "Received UDP packet with invalid session ID\n");
+ LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Received UDP packet with invalid session ID\n");
STAT(tunnel_rx_errors);
return;
}
if (t >= MAXTUNNEL)
{
- log(1, ntohl(addr->sin_addr.s_addr), s, t, "Received UDP packet with invalid tunnel ID\n");
+ LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Received UDP packet with invalid tunnel ID\n");
STAT(tunnel_rx_errors);
return;
}
}
if ((p - buf) > l)
{
- log(1, ntohl(addr->sin_addr.s_addr), s, t, "Bad length %d>%d\n", (p - buf), l);
+ LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Bad length %d>%d\n", (p - buf), l);
STAT(tunnel_rx_errors);
return;
}
if ((*buf & 0xCA) != 0xC8)
{
- log(1, ntohl(addr->sin_addr.s_addr), s, t, "Bad control header %02X\n", *buf);
+ LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Bad control header %02X\n", *buf);
STAT(tunnel_rx_errors);
return;
}
- log(3, ntohl(addr->sin_addr.s_addr), s, t, "Control message (%d bytes): (unacked %d) l-ns %d l-nr %d r-ns %d r-nr %d\n",
+ LOG(3, ntohl(addr->sin_addr.s_addr), s, t, "Control message (%d bytes): (unacked %d) l-ns %d l-nr %d r-ns %d r-nr %d\n",
l, tunnel[t].controlc, tunnel[t].ns, tunnel[t].nr, ns, nr);
// if no tunnel specified, assign one
if (!t)
{
if (!(t = new_tunnel()))
{
- log(1, ntohl(addr->sin_addr.s_addr), 0, 0, "No more tunnels\n");
+ LOG(1, ntohl(addr->sin_addr.s_addr), 0, 0, "No more tunnels\n");
STAT(tunnel_overflow);
return;
}
tunnel[t].ip = ntohl(*(ipt *) & addr->sin_addr);
tunnel[t].port = ntohs(addr->sin_port);
tunnel[t].window = 4; // default window
- log(1, ntohl(addr->sin_addr.s_addr), 0, t, " New tunnel from %u.%u.%u.%u/%u ID %d\n", tunnel[t].ip >> 24, tunnel[t].ip >> 16 & 255, tunnel[t].ip >> 8 & 255, tunnel[t].ip & 255, tunnel[t].port, t);
+ LOG(1, ntohl(addr->sin_addr.s_addr), 0, t, " New tunnel from %u.%u.%u.%u/%u ID %d\n", tunnel[t].ip >> 24, tunnel[t].ip >> 16 & 255, tunnel[t].ip >> 8 & 255, tunnel[t].ip & 255, tunnel[t].port, t);
STAT(tunnel_created);
}
if (ns != tunnel[t].nr)
{
// is this the sequence we were expecting?
- log(1, ntohl(addr->sin_addr.s_addr), 0, t, " Out of sequence tunnel %d, (%d is not the expected %d)\n", t, ns, tunnel[t].nr);
+ LOG(1, ntohl(addr->sin_addr.s_addr), 0, t, " Out of sequence tunnel %d, (%d is not the expected %d)\n", t, ns, tunnel[t].nr);
STAT(tunnel_rx_errors);
if (l) // Is this not a ZLB?
p += n; // next
if (l < n)
{
- log(1, ntohl(addr->sin_addr.s_addr), s, t, "Invalid length in AVP\n");
+ LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Invalid length in AVP\n");
STAT(tunnel_rx_errors);
fatal = flags;
return;
// handle hidden AVPs
if (!*config->l2tpsecret)
{
- log(1, ntohl(addr->sin_addr.s_addr), s, t, "Hidden AVP requested, but no L2TP secret.\n");
+ LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Hidden AVP requested, but no L2TP secret.\n");
fatal = flags;
continue;
}
if (!session[s].random_vector_length)
{
- log(1, ntohl(addr->sin_addr.s_addr), s, t, "Hidden AVP requested, but no random vector.\n");
+ LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Hidden AVP requested, but no random vector.\n");
fatal = flags;
continue;
}
- log(4, ntohl(addr->sin_addr.s_addr), s, t, "Hidden AVP\n");
+ LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "Hidden AVP\n");
// Unhide the AVP
n = unhide_avp(b, t, s, n);
if (n == 0)
}
if (*b & 0x3C)
{
- log(1, ntohl(addr->sin_addr.s_addr), s, t, "Unrecognised AVP flags %02X\n", *b);
+ LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Unrecognised AVP flags %02X\n", *b);
fatal = flags;
continue; // next
}
b += 2;
if (*(u16 *) (b))
{
- log(2, ntohl(addr->sin_addr.s_addr), s, t, "Unknown AVP vendor %d\n", ntohs(*(u16 *) (b)));
+ LOG(2, ntohl(addr->sin_addr.s_addr), s, t, "Unknown AVP vendor %d\n", ntohs(*(u16 *) (b)));
fatal = flags;
continue; // next
}
b += 2;
n -= 6;
- log(4, ntohl(addr->sin_addr.s_addr), s, t, " AVP %d (%s) len %d\n", mtype, avpnames[mtype], n);
+ LOG(4, ntohl(addr->sin_addr.s_addr), s, t, " AVP %d (%s) len %d\n", mtype, avpnames[mtype], n);
switch (mtype)
{
case 0: // message type
message = ntohs(*(u16 *) b);
- log(4, ntohl(addr->sin_addr.s_addr), s, t, " Message type = %d (%s)\n", *b,
+ LOG(4, ntohl(addr->sin_addr.s_addr), s, t, " Message type = %d (%s)\n", *b,
l2tp_message_types[message]);
mandatorymessage = flags;
break;
resdesc = cdn_result_codes[rescode];
}
- log(4, ntohl(addr->sin_addr.s_addr), s, t, " Result Code %d: %s\n",
+ LOG(4, ntohl(addr->sin_addr.s_addr), s, t, " Result Code %d: %s\n",
rescode, resdesc);
if (n >= 4)
{
const char* errdesc = "(unknown)";
if (errcode <= MAX_ERROR_CODE)
errdesc = error_codes[errcode];
- log(4, ntohl(addr->sin_addr.s_addr), s, t, " Error Code %d: %s\n",
+ LOG(4, ntohl(addr->sin_addr.s_addr), s, t, " Error Code %d: %s\n",
errcode, errdesc);
}
if (n > 4)
- log(4, ntohl(addr->sin_addr.s_addr), s, t, " Error String: %.*s\n",
+ LOG(4, ntohl(addr->sin_addr.s_addr), s, t, " Error String: %.*s\n",
n-4, b+4);
break;
case 2: // protocol version
{
version = ntohs(*(u16 *) (b));
- log(4, ntohl(addr->sin_addr.s_addr), s, t, " Protocol version = %d\n", version);
+ LOG(4, ntohl(addr->sin_addr.s_addr), s, t, " Protocol version = %d\n", version);
if (version && version != 0x0100)
{ // allow 0.0 and 1.0
- log(1, ntohl(addr->sin_addr.s_addr), s, t, " Bad protocol version %04X\n",
+ LOG(1, ntohl(addr->sin_addr.s_addr), s, t, " Bad protocol version %04X\n",
version);
fatal = flags;
continue; // next
}
break;
case 3: // framing capabilities
-// log(4, ntohl(addr->sin_addr.s_addr), s, t, "Framing capabilities\n");
+// LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "Framing capabilities\n");
break;
case 4: // bearer capabilities
-// log(4, ntohl(addr->sin_addr.s_addr), s, t, "Bearer capabilities\n");
+// LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "Bearer capabilities\n");
break;
case 5: // tie breaker
// We never open tunnels, so we don't care about tie breakers
-// log(4, ntohl(addr->sin_addr.s_addr), s, t, "Tie breaker\n");
+// LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "Tie breaker\n");
continue;
case 6: // firmware revision
-// log(4, ntohl(addr->sin_addr.s_addr), s, t, "Firmware revision\n");
+// LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "Firmware revision\n");
break;
case 7: // host name
memset(tunnel[t].hostname, 0, 128);
memcpy(tunnel[t].hostname, b, (n >= 127) ? 127 : n);
- log(4, ntohl(addr->sin_addr.s_addr), s, t, " Tunnel hostname = \"%s\"\n", tunnel[t].hostname);
+ LOG(4, ntohl(addr->sin_addr.s_addr), s, t, " Tunnel hostname = \"%s\"\n", tunnel[t].hostname);
// TBA - to send to RADIUS
break;
case 8: // vendor name
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);
+ LOG(4, ntohl(addr->sin_addr.s_addr), s, t, " Vendor name = \"%s\"\n", tunnel[t].vendor);
break;
case 9: // assigned tunnel
tunnel[t].far = ntohs(*(u16 *) (b));
- log(4, ntohl(addr->sin_addr.s_addr), s, t, " Remote tunnel id = %d\n", tunnel[t].far);
+ LOG(4, ntohl(addr->sin_addr.s_addr), s, t, " Remote tunnel id = %d\n", tunnel[t].far);
break;
case 10: // rx window
tunnel[t].window = ntohs(*(u16 *) (b));
if (!tunnel[t].window)
tunnel[t].window = 1; // window of 0 is silly
- log(4, ntohl(addr->sin_addr.s_addr), s, t, " rx window = %d\n", tunnel[t].window);
+ LOG(4, ntohl(addr->sin_addr.s_addr), s, t, " rx window = %d\n", tunnel[t].window);
break;
case 11: // Challenge
{
- log(4, ntohl(addr->sin_addr.s_addr), s, t, " LAC requested CHAP authentication for tunnel\n");
+ LOG(4, ntohl(addr->sin_addr.s_addr), s, t, " LAC requested CHAP authentication for tunnel\n");
build_chap_response(b, 2, n, &chapresponse);
}
break;
case 13: // Response
// Why did they send a response? We never challenge.
- log(2, ntohl(addr->sin_addr.s_addr), s, t, " received unexpected challenge response\n");
- break;
+ LOG(2, ntohl(addr->sin_addr.s_addr), s, t, " received unexpected challenge response\n");
+ break;
case 14: // assigned session
asession = session[s].far = ntohs(*(u16 *) (b));
- log(4, ntohl(addr->sin_addr.s_addr), s, t, " assigned session = %d\n", asession);
+ LOG(4, ntohl(addr->sin_addr.s_addr), s, t, " assigned session = %d\n", asession);
break;
case 15: // call serial number
- log(4, ntohl(addr->sin_addr.s_addr), s, t, " call serial number = %d\n", ntohl(*(u32 *)b));
+ LOG(4, ntohl(addr->sin_addr.s_addr), s, t, " call serial number = %d\n", ntohl(*(u32 *)b));
break;
case 18: // bearer type
- log(4, ntohl(addr->sin_addr.s_addr), s, t, " bearer type = %d\n", ntohl(*(u32 *)b));
+ LOG(4, ntohl(addr->sin_addr.s_addr), s, t, " bearer type = %d\n", ntohl(*(u32 *)b));
// TBA - for RADIUS
break;
case 19: // framing type
- log(4, ntohl(addr->sin_addr.s_addr), s, t, " framing type = %d\n", ntohl(*(u32 *)b));
+ LOG(4, ntohl(addr->sin_addr.s_addr), s, t, " framing type = %d\n", ntohl(*(u32 *)b));
// TBA
break;
case 21: // called number
memset(called, 0, MAXTEL);
memcpy(called, b, (n >= MAXTEL) ? (MAXTEL-1) : n);
- log(4, ntohl(addr->sin_addr.s_addr), s, t, " Called <%s>\n", called);
+ LOG(4, ntohl(addr->sin_addr.s_addr), s, t, " Called <%s>\n", called);
break;
case 22: // calling number
memset(calling, 0, MAXTEL);
memcpy(calling, b, (n >= MAXTEL) ? (MAXTEL-1) : n);
- log(4, ntohl(addr->sin_addr.s_addr), s, t, " Calling <%s>\n", calling);
+ LOG(4, ntohl(addr->sin_addr.s_addr), s, t, " Calling <%s>\n", calling);
break;
case 23: // subtype
break;
memcpy(tmp, b, (n >= 30) ? 30 : n);
session[s].tx_connect_speed = atol(tmp);
}
- log(4, ntohl(addr->sin_addr.s_addr), s, t, " TX connect speed <%u>\n",
+ LOG(4, ntohl(addr->sin_addr.s_addr), s, t, " TX connect speed <%u>\n",
session[s].tx_connect_speed);
break;
case 38: // rx connect speed
memcpy(tmp, b, (n >= 30) ? 30 : n);
session[s].rx_connect_speed = atol(tmp);
}
- log(4, ntohl(addr->sin_addr.s_addr), s, t, " RX connect speed <%u>\n",
+ LOG(4, ntohl(addr->sin_addr.s_addr), s, t, " RX connect speed <%u>\n",
session[s].rx_connect_speed);
break;
case 25: // Physical Channel ID
{
u32 tmp = ntohl(*(u32 *)b);
- log(4, ntohl(addr->sin_addr.s_addr), s, t, " Physical Channel ID <%X>\n", tmp);
+ LOG(4, ntohl(addr->sin_addr.s_addr), s, t, " Physical Channel ID <%X>\n", tmp);
break;
}
case 29: // Proxy Authentication Type
{
u16 authtype = ntohs(*(u16 *)b);
- log(4, ntohl(addr->sin_addr.s_addr), s, t, " Proxy Auth Type %d (%s)\n",
+ LOG(4, ntohl(addr->sin_addr.s_addr), s, t, " Proxy Auth Type %d (%s)\n",
authtype, authtypes[authtype]);
requestchap = (authtype == 2);
break;
{
char authname[64] = {0};
memcpy(authname, b, (n > 63) ? 63 : n);
- log(4, ntohl(addr->sin_addr.s_addr), s, t, " Proxy Auth Name (%s)\n",
+ LOG(4, ntohl(addr->sin_addr.s_addr), s, t, " Proxy Auth Name (%s)\n",
authname);
break;
}
case 31: // Proxy Authentication Challenge
{
memcpy(radius[session[s].radius].auth, b, 16);
- log(4, ntohl(addr->sin_addr.s_addr), s, t, " Proxy Auth Challenge\n");
+ LOG(4, ntohl(addr->sin_addr.s_addr), s, t, " Proxy Auth Challenge\n");
break;
}
case 32: // Proxy Authentication ID
{
u16 authid = ntohs(*(u16 *)(b));
- log(4, ntohl(addr->sin_addr.s_addr), s, t, " Proxy Auth ID (%d)\n",
+ LOG(4, ntohl(addr->sin_addr.s_addr), s, t, " Proxy Auth ID (%d)\n",
authid);
if (session[s].radius)
radius[session[s].radius].id = authid;
{
char authresp[64] = {0};
memcpy(authresp, b, (n > 63) ? 63 : n);
- log(4, ntohl(addr->sin_addr.s_addr), s, t, " Proxy Auth Response\n");
+ LOG(4, ntohl(addr->sin_addr.s_addr), s, t, " Proxy Auth Response\n");
break;
}
case 27: // last send lcp
{ // find magic number
u8 *p = b, *e = p + n;
- while (p < e && p[1])
+ while (p + 1 < e && p[1] && p + p[1] <= e)
{
- if (*p == 5 && p[1] == 6)
+ if (*p == 5 && p[1] == 6) // Magic-Number
amagic = ntohl(*(u32 *) (p + 2));
- else if (*p == 3 && p[1] == 5 && *(u16 *) (p + 2) == htons(PPPCHAP) && p[4] == 5)
+ else if (*p == 3 && p[1] == 5 && *(u16 *) (p + 2) == htons(PPPCHAP) && p[4] == 5) // Authentication-Protocol
chap = 1;
- else if (*p == 7)
+ else if (*p == 7) // Protocol-Field-Compression
aflags |= SESSIONPFC;
- else if (*p == 8)
+ else if (*p == 8) // Address-and-Control-Field-Compression
aflags |= SESSIONACFC;
p += p[1];
}
-
- {
- char tmp[500] = {0};
- tmp[0] = ConfigReq;
- memcpy((tmp + 1), b, n);
- }
}
break;
case 28: // last recv lcp confreq
- {
- char tmp[500] = {0};
- tmp[0] = ConfigReq;
- memcpy((tmp + 1), b, n);
- break;
- }
+ break;
case 26: // Initial Received LCP CONFREQ
- {
- char tmp[500] = {0};
- tmp[0] = ConfigReq;
- memcpy((tmp + 1), b, n);
- }
break;
case 39: // seq required - we control it as an LNS anyway...
break;
case 36: // Random Vector
- log(4, ntohl(addr->sin_addr.s_addr), s, t, " Random Vector received. Enabled AVP Hiding.\n");
+ LOG(4, ntohl(addr->sin_addr.s_addr), s, t, " Random Vector received. Enabled AVP Hiding.\n");
memset(session[s].random_vector, 0, sizeof(session[s].random_vector));
memcpy(session[s].random_vector, b, n);
session[s].random_vector_length = n;
break;
default:
- log(2, ntohl(addr->sin_addr.s_addr), s, t, " Unknown AVP type %d\n", mtype);
+ LOG(2, ntohl(addr->sin_addr.s_addr), s, t, " Unknown AVP type %d\n", mtype);
fatal = flags;
continue; // next
}
// make a RADIUS session
if (!(r = radiusnew(s)))
{
- log(1, ntohl(addr->sin_addr.s_addr), s, t, "No free RADIUS sessions for ICRQ\n");
+ LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "No free RADIUS sessions for ICRQ\n");
sessionkill(s, "no free RADIUS sesions");
return;
}
session[s].tunnel = t;
session[s].far = asession;
session[s].last_packet = time_now;
- log(3, ntohl(addr->sin_addr.s_addr), s, t, "New session (%d/%d)\n", tunnel[t].far, session[s].far);
+ LOG(3, ntohl(addr->sin_addr.s_addr), s, t, "New session (%d/%d)\n", tunnel[t].far, session[s].far);
control16(c, 14, s, 1); // assigned session
controladd(c, t, s); // send the reply
{
if (amagic == 0) amagic = time_now;
session[s].magic = amagic; // set magic number
session[s].l2tp_flags = aflags; // set flags received
- log(3, ntohl(addr->sin_addr.s_addr), s, t, "Magic %X Flags %X\n", amagic, aflags);
+ LOG(3, ntohl(addr->sin_addr.s_addr), s, t, "Magic %X Flags %X\n", amagic, aflags);
controlnull(t); // ack
// In CHAP state, request PAP instead
if (requestchap)
sessionshutdown(s, "Closed (Received CDN)");
break;
case 0xFFFF:
- log(1, ntohl(addr->sin_addr.s_addr), s, t, "Missing message type\n");
+ LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Missing message type\n");
break;
default:
STAT(tunnel_rx_errors);
if (mandatorymessage & 0x80)
tunnelshutdown(t, "Unknown message");
else
- log(1, ntohl(addr->sin_addr.s_addr), s, t, "Unknown message type %d\n", message);
+ LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Unknown message type %d\n", message);
break;
}
if (chapresponse) free(chapresponse);
}
else
{
- log(4, 0, s, t, " Got a ZLB ack\n");
+ LOG(4, 0, s, t, " Got a ZLB ack\n");
}
}
else
{ // data
u16 prot;
- log_hex(5, "Receive Tunnel Data", p, l);
+ LOG_HEX(5, "Receive Tunnel Data", p, l);
if (l > 2 && p[0] == 0xFF && p[1] == 0x03)
{ // HDLC address header, discard
p += 2;
}
if (l < 2)
{
- log(1, ntohl(addr->sin_addr.s_addr), s, t, "Short ppp length %d\n", l);
+ LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Short ppp length %d\n", l);
STAT(tunnel_rx_errors);
return;
}
}
- log(1, ntohl(addr->sin_addr.s_addr), s, t, "UDP packet contains session %d "
+ LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "UDP packet contains session %d "
"but no session[%d].tunnel exists (LAC said"
" tunnel = %d). Dropping packet.\n", s, s, t);
STAT(tunnel_rx_errors);
if (session[s].die)
{
- log(3, ntohl(addr->sin_addr.s_addr), s, t, "Session %d is closing. Don't process PPP packets\n", s);
+ LOG(3, ntohl(addr->sin_addr.s_addr), s, t, "Session %d is closing. Don't process PPP packets\n", s);
// I'm pretty sure this isn't right -- mo.
// return; // closing session, PPP not processed
}
}
else if (prot == PPPIP)
{
- if (!config->cluster_iam_master)
+ session[s].last_packet = time_now;
+ if (session[s].walled_garden && !config->cluster_iam_master)
{
- // We're a slave. Should we forward this packet to the master?
-
- // Is this a walled garden session, or something that needs it's
- // idle time updated??
-
- // Maintain the idle timeouts on the master. If this would
- // significantly reset the idletimeout, run it via the master
- // to refresh the master's idle timer.
- // Not sure this is ideal: It may re-order packets.
-
- if (session[s].walled_garden || (session[s].last_packet + (ECHO_TIMEOUT/2)) < time_now)
- {
- master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port);
- session[s].last_packet = time_now;
- return;
- }
- // fall through to processipin.
- } else
- session[s].last_packet = time_now;
+ master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port);
+ return;
+ }
processipin(t, s, p, l);
}
else
{
STAT(tunnel_rx_errors);
- log(1, ntohl(addr->sin_addr.s_addr), s, t, "Unknown PPP protocol %04X\n", prot);
+ LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Unknown PPP protocol %04X\n", prot);
}
}
}
// read and process packet on tun
void processtun(u8 * buf, int len)
{
- log_hex(5, "Receive TUN Data", buf, len);
+ LOG_HEX(5, "Receive TUN Data", buf, len);
STAT(tun_rx_packets);
INC_STAT(tun_rx_bytes, len);
eth_rx += len;
if (len < 22)
{
- log(1, 0, 0, 0, "Short tun packet %d bytes\n", len);
+ LOG(1, 0, 0, 0, "Short tun packet %d bytes\n", len);
STAT(tun_rx_errors);
return;
}
static clockt next_acct = 0;
int a;
- log(3, 0, 0, 0, "Begin regular cleanup\n");
+ LOG(3, 0, 0, 0, "Begin regular cleanup\n");
for (r = 1; r < MAXRADIUS; r++)
{
{
controlt *c = controlnew(6); // sending HELLO
controladd(c, t, 0); // send the message
- log(3, tunnel[t].ip, 0, t, "Sending HELLO message\n");
+ LOG(3, tunnel[t].ip, 0, t, "Sending HELLO message\n");
}
// Check for tunnel changes requested from the CLI
cli_tunnel_actions[t].action = 0;
if (a & CLI_TUN_KILL)
{
- log(2, tunnel[t].ip, 0, t, "Dropping tunnel by CLI\n");
+ LOG(2, tunnel[t].ip, 0, t, "Dropping tunnel by CLI\n");
tunnelshutdown(t, "Requested by administrator");
}
}
if (!session[s].die && session[s].ip && !(session[s].flags & SF_IPCP_ACKED))
{
// IPCP has not completed yet. Resend
- log(3, session[s].ip, s, session[s].tunnel, "No ACK for initial IPCP ConfigReq... resending\n");
+ LOG(3, session[s].ip, s, session[s].tunnel, "No ACK for initial IPCP ConfigReq... resending\n");
sendipcp(session[s].tunnel, s);
}
u8 *q = makeppp(b, sizeof(b), 0, 0, session[s].tunnel, s, PPPLCP);
if (!q)
{
- log(3, session[s].ip, s, t, "failed to send ECHO packet.\n");
+ LOG(3, session[s].ip, s, t, "failed to send ECHO packet.\n");
continue;
}
*(u16 *)(q + 2) = htons(8); // Length
*(u32 *)(q + 4) = 0; // Magic Number (not supported)
- log(4, session[s].ip, s, session[s].tunnel, "No data in %d seconds, sending LCP ECHO\n",
+ LOG(4, session[s].ip, s, session[s].tunnel, "No data in %d seconds, sending LCP ECHO\n",
(int)(time_now - session[s].last_packet));
tunnelsend(b, 24, session[s].tunnel); // send it
if (++count >= MAX_ACTIONS) break;
cli_session_actions[s].action = 0;
if (a & CLI_SESS_KILL)
{
- log(2, 0, s, session[s].tunnel, "Dropping session by CLI\n");
+ LOG(2, 0, s, session[s].tunnel, "Dropping session by CLI\n");
sessionshutdown(s, "Requested by administrator");
a = 0; // dead, no need to check for other actions
}
- if (a & CLI_SESS_SNOOP)
+ if (a & CLI_SESS_NOSNOOP)
{
- log(2, 0, s, session[s].tunnel, "Snooping session by CLI (to %s:%d)\n",
+ LOG(2, 0, s, session[s].tunnel, "Unsnooping session by CLI\n");
+ session[s].snoop_ip = 0;
+ session[s].snoop_port = 0;
+ send++;
+ }
+ else if (a & CLI_SESS_SNOOP)
+ {
+ LOG(2, 0, s, session[s].tunnel, "Snooping session by CLI (to %s:%d)\n",
inet_toa(cli_session_actions[s].snoop_ip), cli_session_actions[s].snoop_port);
session[s].snoop_ip = cli_session_actions[s].snoop_ip;
send++;
}
- if (a & CLI_SESS_NOSNOOP)
+ if (a & CLI_SESS_NOTHROTTLE)
{
- log(2, 0, s, session[s].tunnel, "Unsnooping session by CLI\n");
- session[s].snoop_ip = 0;
- session[s].snoop_port = 0;
+ LOG(2, 0, s, session[s].tunnel, "Un-throttling session by CLI\n");
+ throttle_session(s, 0, 0);
send++;
}
-
- if (a & CLI_SESS_THROTTLE)
+ else if (a & CLI_SESS_THROTTLE)
{
- log(2, 0, s, session[s].tunnel, "Throttling session by CLI (to %dkb/s up and %dkb/s down)\n",
- cli_session_actions[s].throttle & 0xFFFF,
- cli_session_actions[s].throttle >> 16);
-
- throttle_session(s, cli_session_actions[s].throttle);
- }
+ LOG(2, 0, s, session[s].tunnel, "Throttling session by CLI (to %dkb/s up and %dkb/s down)\n",
+ cli_session_actions[s].throttle_in,
+ cli_session_actions[s].throttle_out);
- if (a & CLI_SESS_NOTHROTTLE)
- {
- log(2, 0, s, session[s].tunnel, "Un-throttling session by CLI\n");
- throttle_session(s, 0);
+ throttle_session(s, cli_session_actions[s].throttle_in, cli_session_actions[s].throttle_out);
+ send++;
}
if (send)
}
}
- if (config->accounting_dir && next_acct <= TIME)
+ if (*config->accounting_dir && next_acct <= TIME)
{
// Dump accounting data
next_acct = TIME + ACCT_TIME;
if (count >= MAX_ACTIONS)
return 1; // Didn't finish!
- log(3, 0, 0, 0, "End regular cleanup (%d actions), next in %d seconds\n", count, config->cleanup_interval);
+ LOG(3, 0, 0, 0, "End regular cleanup (%d actions), next in %d seconds\n", count, config->cleanup_interval);
return 0;
}
if (last_talked != TIME)
{
- log(2,0,0,0, "Tunnel %d still has un-acked control messages.\n", i);
+ LOG(2,0,0,0, "Tunnel %d still has un-acked control messages.\n", i);
last_talked = TIME;
}
return 1;
}
- // We stop waiting for radius after BUSY_WAIT_TIMEOUT 1/10th seconds
- if (abs(TIME - start_busy_wait) > BUSY_WAIT_TIMEOUT)
+ // We stop waiting for radius after BUSY_WAIT_TIME 1/10th seconds
+ if (abs(TIME - start_busy_wait) > BUSY_WAIT_TIME)
{
- log(1, 0, 0, 0, "Giving up waiting for RADIUS to be empty. Shutting down anyway.\n");
+ LOG(1, 0, 0, 0, "Giving up waiting for RADIUS to be empty. Shutting down anyway.\n");
return 0;
}
if (last_talked != TIME)
{
- log(2,0,0,0, "Radius session %d is still busy (sid %d)\n", i, radius[i].session);
+ LOG(2,0,0,0, "Radius session %d is still busy (sid %d)\n", i, radius[i].session);
last_talked = TIME;
}
return 1;
return 0;
}
+static fd_set readset;
+static int readset_n = 0;
+
// main loop - gets packets on tun or udp and processes them
void mainloop(void)
{
- fd_set cr;
- int cn, i;
+ int i;
u8 buf[65536];
struct timeval to;
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, tunfd=%d, cluster_sockfd=%d, controlfd=%d\n",
+ LOG(4, 0, 0, 0, "Beginning of main loop. udpfd=%d, tunfd=%d, cluster_sockfd=%d, controlfd=%d\n",
udpfd, tunfd, cluster_sockfd, controlfd);
- FD_ZERO(&cr);
- FD_SET(udpfd, &cr);
- FD_SET(tunfd, &cr);
- FD_SET(controlfd, &cr);
- FD_SET(clifd, &cr);
- if (cluster_sockfd) FD_SET(cluster_sockfd, &cr);
- cn = udpfd;
- if (cn < tunfd) cn = tunfd;
- if (cn < controlfd) cn = controlfd;
- if (cn < clifd) cn = clifd;
- if (cn < cluster_sockfd) cn = cluster_sockfd;
- for (i = 0; i < config->num_radfds; i++)
- {
- if (!radfds[i]) continue;
- FD_SET(radfds[i], &cr);
- if (radfds[i] > cn)
- cn = radfds[i];
- }
+ FD_ZERO(&readset);
+ FD_SET(udpfd, &readset);
+ FD_SET(tunfd, &readset);
+ FD_SET(controlfd, &readset);
+ FD_SET(clifd, &readset);
+ if (cluster_sockfd) FD_SET(cluster_sockfd, &readset);
+ readset_n = udpfd;
+ if (tunfd > readset_n) readset_n = tunfd;
+ if (controlfd > readset_n) readset_n = controlfd;
+ if (clifd > readset_n) readset_n = clifd;
+ if (cluster_sockfd > readset_n) readset_n = cluster_sockfd;
while (!main_quit || still_busy())
{
fd_set r;
- int n = cn;
+ int n = readset_n;
#ifdef BGP
fd_set w;
int bgp_set[BGP_NUM_PEERS];
update_config();
}
- memcpy(&r, &cr, sizeof(fd_set));
+ memcpy(&r, &readset, sizeof(fd_set));
to.tv_sec = 0;
to.tv_usec = 100000; // 1/10th of a second.
TIME = now();
if (n < 0)
{
- if (errno == EINTR)
+ if (errno == EINTR ||
+ errno == ECHILD) // EINTR was clobbered by sigchild_handler()
continue;
- log(0, 0, 0, 0, "Error returned from select(): %s\n", strerror(errno));
+ LOG(0, 0, 0, 0, "Error returned from select(): %s\n", strerror(errno));
main_quit++;
break;
}
break;
}
}
- 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 (config->cluster_iam_master)
+ 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;
if ((sockfd = accept(clifd, (struct sockaddr *)&addr, &len)) <= 0)
{
- log(0, 0, 0, 0, "accept error: %s\n", strerror(errno));
+ LOG(0, 0, 0, 0, "accept error: %s\n", strerror(errno));
continue;
}
else
// Important!!! We MUST not process any packets past this point!
}
+static void stripdomain(char *host)
+{
+ char *p;
+
+ if ((p = strchr(host, '.')))
+ {
+ char *domain = 0;
+ char _domain[1024];
+
+ // strip off domain
+ FILE *resolv = fopen("/etc/resolv.conf", "r");
+ if (resolv)
+ {
+ char buf[1024];
+ char *b;
+
+ while (fgets(buf, sizeof(buf), resolv))
+ {
+ if (strncmp(buf, "domain", 6) && strncmp(buf, "search", 6))
+ continue;
+
+ if (!isspace(buf[6]))
+ continue;
+
+ b = buf + 7;
+ while (isspace(*b)) b++;
+
+ if (*b)
+ {
+ char *d = b;
+ while (*b && !isspace(*b)) b++;
+ *b = 0;
+ if (buf[0] == 'd') // domain is canonical
+ {
+ domain = d;
+ break;
+ }
+
+ // first search line
+ if (!domain)
+ {
+ // hold, may be subsequent domain line
+ strncpy(_domain, d, sizeof(_domain))[sizeof(_domain)-1] = 0;
+ domain = _domain;
+ }
+ }
+ }
+
+ fclose(resolv);
+ }
+
+ if (domain)
+ {
+ int hl = strlen(host);
+ int dl = strlen(domain);
+ if (dl < hl && host[hl - dl - 1] == '.' && !strcmp(host + hl - dl, domain))
+ host[hl -dl - 1] = 0;
+ }
+ else
+ {
+ *p = 0; // everything after first dot
+ }
+ }
+}
+
// Init data structures
-void initdata(void)
+void initdata(int optdebug, char *optconfig)
{
int i;
- 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));
+ 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));
+ 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);
+ strncpy(config->config_file, optconfig, strlen(optconfig));
+ config->debug = optdebug;
+ config->num_tbfs = MAXTBFS;
+ config->rl_rate = 28; // 28kbps
+
+ if (!(tunnel = shared_malloc(sizeof(tunnelt) * MAXTUNNEL)))
{
- log(0, 0, 0, 0, "Error doing malloc for tunnels: %s\n", strerror(errno));
+ 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));
+ 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));
+ 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));
+ 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));
+ 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));
+ 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));
+ 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));
+ LOG(0, 0, 0, 0, "Error doing malloc for cli tunnel actions: %s\n", strerror(errno));
exit(1);
}
memset(cli_tunnel_actions, 0, sizeof(struct cli_tunnel_actions) * MAXSESSION);
if (!*hostname)
{
- char *p;
// Grab my hostname unless it's been specified
gethostname(hostname, sizeof(hostname));
- if ((p = strchr(hostname, '.'))) *p = 0;
+ stripdomain(hostname);
}
+
_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));
+ LOG(0, 0, 0, 0, "Error doing malloc for bgp: %s\n", strerror(errno));
exit(1);
}
#endif /* BGP */
if (best < 0)
{
- log(0, 0, s, session[s].tunnel, "assign_ip_address(): out of addresses\n");
+ LOG(0, 0, s, session[s].tunnel, "assign_ip_address(): out of addresses\n");
return 0;
}
strncpy(ip_address_pool[best].user, u, sizeof(ip_address_pool[best].user) - 1);
STAT(ip_allocated);
- log(4, ip_address_pool[best].address, s, session[s].tunnel,
+ LOG(4, ip_address_pool[best].address, s, session[s].tunnel,
"assign_ip_address(): %s ip address %d from pool\n", reuse ? "Reusing" : "Allocating", best);
return 1;
if (ipid < 1) // Not found in the pool either? good.
continue;
- log(0, 0, i, 0, "Session %d has an IP address (%s) that was marked static, but is in the pool (%d)!\n",
+ LOG(0, 0, i, 0, "Session %d has an IP address (%s) that was marked static, but is in the pool (%d)!\n",
i, inet_toa(session[i].ip), ipid);
// Fall through and process it as part of the pool.
if (ipid > MAXIPPOOL || ipid < 0)
{
- log(0, 0, i, 0, "Session %d has a pool IP that's not found in the pool! (%d)\n", i, ipid);
+ LOG(0, 0, i, 0, "Session %d has a pool IP that's not found in the pool! (%d)\n", i, ipid);
ipid = -1;
session[i].ip_pool_index = ipid;
continue;
++ip_pool_size;
if (ip_pool_size >= MAXIPPOOL)
{
- log(0,0,0,0, "Overflowed IP pool adding %s\n", inet_toa(htonl(addr)) );
+ LOG(0,0,0,0, "Overflowed IP pool adding %s\n", inet_toa(htonl(addr)) );
return;
}
}
if (!(f = fopen(IPPOOLFILE, "r")))
{
- log(0, 0, 0, 0, "Can't load pool file " IPPOOLFILE ": %s\n", strerror(errno));
+ LOG(0, 0, 0, 0, "Can't load pool file " IPPOOLFILE ": %s\n", strerror(errno));
exit(1);
}
src = inet_addr(buf);
if (src == INADDR_NONE)
{
- log(0, 0, 0, 0, "Invalid address pool IP %s\n", buf);
+ LOG(0, 0, 0, 0, "Invalid address pool IP %s\n", buf);
exit(1);
}
// This entry is for a specific IP only
int numbits = 0;
u32 start = 0, mask = 0;
- log(2, 0, 0, 0, "Adding IP address range %s\n", buf);
+ LOG(2, 0, 0, 0, "Adding IP address range %s\n", buf);
*p++ = 0;
if (!*p || !(numbits = atoi(p)))
{
- log(0, 0, 0, 0, "Invalid pool range %s\n", buf);
+ LOG(0, 0, 0, 0, "Invalid pool range %s\n", buf);
continue;
}
start = ntohl(inet_addr(pool));
mask = (u32)(pow(2, numbits) - 1) << (32 - numbits);
// Add a static route for this pool
- log(5, 0, 0, 0, "Adding route for address pool %s/%u\n", inet_toa(htonl(start)), 32 + mask);
+ LOG(5, 0, 0, 0, "Adding route for address pool %s/%u\n", inet_toa(htonl(start)), 32 + mask);
routeset(0, start, mask, 0, 1);
add_to_ip_pool(start, mask);
}
}
fclose(f);
- log(1, 0, 0, 0, "IP address pool is %d addresses\n", ip_pool_size - 1);
+ LOG(1, 0, 0, 0, "IP address pool is %d addresses\n", ip_pool_size - 1);
}
void snoop_send_packet(char *packet, u16 size, ipt destination, u16 port)
snoop_addr.sin_addr.s_addr = destination;
snoop_addr.sin_port = ntohs(port);
- log(5, 0, 0, 0, "Snooping packet at %p (%d bytes) to %s:%d\n",
+ LOG(5, 0, 0, 0, "Snooping packet at %p (%d bytes) to %s:%d\n",
packet, size, inet_toa(snoop_addr.sin_addr.s_addr), htons(snoop_addr.sin_port));
if (sendto(snoopfd, packet, size, MSG_DONTWAIT | MSG_NOSIGNAL, (void *) &snoop_addr, sizeof(snoop_addr)) < 0)
- log(0, 0, 0, 0, "Error sending intercept packet: %s\n", strerror(errno));
+ LOG(0, 0, 0, 0, "Error sending intercept packet: %s\n", strerror(errno));
STAT(packets_snooped);
}
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)
{
time_t now = time(NULL);
if (!(f = fopen(filename, "w")))
{
- log(0, 0, 0, 0, "Can't write accounting info to %s: %s\n", filename, strerror(errno));
+ LOG(0, 0, 0, 0, "Can't write accounting info to %s: %s\n", filename, strerror(errno));
return ;
}
- log(3, 0, 0, 0, "Dumping accounting information to %s\n", filename);
+ LOG(3, 0, 0, 0, "Dumping accounting information to %s\n", filename);
fprintf(f, "# dslwatch.pl dump file V1.01\n"
"# host: %s\n"
"# time: %ld\n"
now - basetime);
}
- log(4, 0, 0, 0, "Dumping accounting information for %s\n", session[i].user);
+ LOG(4, 0, 0, 0, "Dumping accounting information for %s\n", session[i].user);
fprintf(f, "%s %s %d %u %u\n",
- session[i].user, // username
- inet_toa(htonl(session[i].ip)), // ip
- (session[i].throttle) ? 2 : 1, // qos
- (u32)session[i].cin, // uptxoctets
- (u32)session[i].cout); // downrxoctets
+ session[i].user, // username
+ inet_toa(htonl(session[i].ip)), // ip
+ (session[i].throttle_in || session[i].throttle_out) ? 2 : 1, // qos
+ (u32)session[i].cin, // uptxoctets
+ (u32)session[i].cout); // downrxoctets
session[i].pin = session[i].cin = 0;
session[i].pout = session[i].cout = 0;
{
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(hostname);
read_config_file();
+ init_tbf(config->num_tbfs);
- log(0, 0, 0, 0, "L2TPNS version " VERSION "\n");
- log(0, 0, 0, 0, "Copyright (c) 2003, 2004 Optus Internet Engineering\n");
- log(0, 0, 0, 0, "Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced\n");
+ LOG(0, 0, 0, 0, "L2TPNS version " VERSION "\n");
+ LOG(0, 0, 0, 0, "Copyright (c) 2003, 2004 Optus Internet Engineering\n");
+ LOG(0, 0, 0, 0, "Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced\n");
{
struct rlimit rlim;
rlim.rlim_cur = RLIM_INFINITY;
rlim.rlim_max = RLIM_INFINITY;
// Remove the maximum core size
if (setrlimit(RLIMIT_CORE, &rlim) < 0)
- log(0, 0, 0, 0, "Can't set ulimit: %s\n", strerror(errno));
+ LOG(0, 0, 0, 0, "Can't set ulimit: %s\n", strerror(errno));
// Make core dumps go to /tmp
chdir("/tmp");
}
if (get_nprocs() < 2)
{
- log(0, 0, 0, 0, "Not using FIFO scheduler, there is only 1 processor in the system.\n");
+ LOG(0, 0, 0, 0, "Not using FIFO scheduler, there is only 1 processor in the system.\n");
config->scheduler_fifo = 0;
}
else
{
if ((ret = sched_setscheduler(0, SCHED_FIFO, ¶ms)) == 0)
{
- log(1, 0, 0, 0, "Using FIFO scheduler. Say goodbye to any other processes running\n");
+ LOG(1, 0, 0, 0, "Using FIFO scheduler. Say goodbye to any other processes running\n");
}
else
{
- log(0, 0, 0, 0, "Error setting scheduler to FIFO: %s\n", strerror(errno));
+ LOG(0, 0, 0, 0, "Error setting scheduler to FIFO: %s\n", strerror(errno));
config->scheduler_fifo = 0;
}
}
#endif /* BGP */
inittun();
- log(1, 0, 0, 0, "Set up on interface %s\n", config->tundevice);
+ LOG(1, 0, 0, 0, "Set up on interface %s\n", config->tundevice);
initudp();
initrad();
if (config->lock_pages)
{
if (!mlockall(MCL_CURRENT))
- log(1, 0, 0, 0, "Locking pages into memory\n");
+ LOG(1, 0, 0, 0, "Locking pages into memory\n");
else
- log(0, 0, 0, 0, "Can't lock pages: %s\n", strerror(errno));
+ LOG(0, 0, 0, 0, "Can't lock pages: %s\n", strerror(errno));
}
alarm(1);
void sigterm_handler(int junk)
{
- log(1, 0, 0, 0, "Shutting down cleanly\n");
+ LOG(1, 0, 0, 0, "Shutting down cleanly\n");
if (config->save_state)
dump_state();
{
int i;
- log(1, 0, 0, 0, "Shutting down without saving sessions\n");
+ LOG(1, 0, 0, 0, "Shutting down without saving sessions\n");
for (i = 1; i < MAXSESSION; i++)
{
if (session[i].opened)
if (sb.st_mtime < (time(NULL) - 60))
{
- log(0, 0, 0, 0, "State file is too old to read, ignoring\n");
+ LOG(0, 0, 0, 0, "State file is too old to read, ignoring\n");
unlink(STATEFILE);
return ;
}
if (!f)
{
- log(0, 0, 0, 0, "Can't read state file: %s\n", strerror(errno));
+ LOG(0, 0, 0, 0, "Can't read state file: %s\n", strerror(errno));
exit(1);
}
if (fread(magic, sizeof(magic), 1, f) != 1 || strncmp(magic, DUMP_MAGIC, sizeof(magic)))
{
- log(0, 0, 0, 0, "Bad state file magic\n");
+ LOG(0, 0, 0, 0, "Bad state file magic\n");
exit(1);
}
- log(1, 0, 0, 0, "Reading state information\n");
+ LOG(1, 0, 0, 0, "Reading state information\n");
if (fread(buf, sizeof(buf), 1, f) != 1 || buf[0] > MAXIPPOOL || buf[1] != sizeof(ippoolt))
{
- log(0, 0, 0, 0, "Error/mismatch reading ip pool header from state file\n");
+ LOG(0, 0, 0, 0, "Error/mismatch reading ip pool header from state file\n");
exit(1);
}
if (buf[0] > ip_pool_size)
{
- log(0, 0, 0, 0, "ip pool has shrunk! state = %d, current = %d\n", buf[0], ip_pool_size);
+ LOG(0, 0, 0, 0, "ip pool has shrunk! state = %d, current = %d\n", buf[0], ip_pool_size);
exit(1);
}
- log(2, 0, 0, 0, "Loading %u ip addresses\n", buf[0]);
+ LOG(2, 0, 0, 0, "Loading %u ip addresses\n", buf[0]);
for (i = 0; i < buf[0]; i++)
{
if (fread(&itmp, sizeof(itmp), 1, f) != 1)
{
- log(0, 0, 0, 0, "Error reading ip %d from state file: %s\n", i, strerror(errno));
+ LOG(0, 0, 0, 0, "Error reading ip %d from state file: %s\n", i, strerror(errno));
exit(1);
}
if (itmp.address != ip_address_pool[i].address)
{
- log(0, 0, 0, 0, "Mismatched ip %d from state file: pool may only be extended\n", i);
+ LOG(0, 0, 0, 0, "Mismatched ip %d from state file: pool may only be extended\n", i);
exit(1);
}
if (fread(buf, sizeof(buf), 1, f) != 1 || buf[0] != MAXTUNNEL || buf[1] != sizeof(tunnelt))
{
- log(0, 0, 0, 0, "Error/mismatch reading tunnel header from state file\n");
+ LOG(0, 0, 0, 0, "Error/mismatch reading tunnel header from state file\n");
exit(1);
}
- log(2, 0, 0, 0, "Loading %u tunnels\n", MAXTUNNEL);
+ LOG(2, 0, 0, 0, "Loading %u tunnels\n", MAXTUNNEL);
if (fread(tunnel, sizeof(tunnelt), MAXTUNNEL, f) != MAXTUNNEL)
{
- log(0, 0, 0, 0, "Error reading tunnel data from state file\n");
+ LOG(0, 0, 0, 0, "Error reading tunnel data from state file\n");
exit(1);
}
tunnel[i].controls = NULL;
tunnel[i].controle = NULL;
if (*tunnel[i].hostname)
- log(3, 0, 0, 0, "Created tunnel for %s\n", tunnel[i].hostname);
+ LOG(3, 0, 0, 0, "Created tunnel for %s\n", tunnel[i].hostname);
}
if (fread(buf, sizeof(buf), 1, f) != 1 || buf[0] != MAXSESSION || buf[1] != sizeof(sessiont))
{
- log(0, 0, 0, 0, "Error/mismatch reading session header from state file\n");
+ LOG(0, 0, 0, 0, "Error/mismatch reading session header from state file\n");
exit(1);
}
- log(2, 0, 0, 0, "Loading %u sessions\n", MAXSESSION);
+ LOG(2, 0, 0, 0, "Loading %u sessions\n", MAXSESSION);
if (fread(session, sizeof(sessiont), MAXSESSION, f) != MAXSESSION)
{
- log(0, 0, 0, 0, "Error reading session data from state file\n");
+ LOG(0, 0, 0, 0, "Error reading session data from state file\n");
exit(1);
}
session[i].tbf_out = 0;
if (session[i].opened)
{
- log(2, 0, i, 0, "Loaded active session for user %s\n", session[i].user);
+ LOG(2, 0, i, 0, "Loaded active session for user %s\n", session[i].user);
if (session[i].ip)
sessionsetup(session[i].tunnel, i);
}
}
fclose(f);
- log(0, 0, 0, 0, "Loaded saved state information\n");
+ LOG(0, 0, 0, 0, "Loaded saved state information\n");
}
void dump_state()
if (!(f = fopen(STATEFILE, "w")))
break;
- log(1, 0, 0, 0, "Dumping state information\n");
+ LOG(1, 0, 0, 0, "Dumping state information\n");
if (fwrite(DUMP_MAGIC, sizeof(DUMP_MAGIC) - 1, 1, f) != 1)
break;
- log(2, 0, 0, 0, "Dumping %u ip addresses\n", ip_pool_size);
+ LOG(2, 0, 0, 0, "Dumping %u ip addresses\n", ip_pool_size);
buf[0] = ip_pool_size;
buf[1] = sizeof(ippoolt);
if (fwrite(buf, sizeof(buf), 1, f) != 1)
if (fwrite(ip_address_pool, sizeof(ippoolt), ip_pool_size, f) != ip_pool_size)
break;
- log(2, 0, 0, 0, "Dumping %u tunnels\n", MAXTUNNEL);
+ LOG(2, 0, 0, 0, "Dumping %u tunnels\n", MAXTUNNEL);
buf[0] = MAXTUNNEL;
buf[1] = sizeof(tunnelt);
if (fwrite(buf, sizeof(buf), 1, f) != 1)
if (fwrite(tunnel, sizeof(tunnelt), MAXTUNNEL, f) != MAXTUNNEL)
break;
- log(2, 0, 0, 0, "Dumping %u sessions\n", MAXSESSION);
+ LOG(2, 0, 0, 0, "Dumping %u sessions\n", MAXSESSION);
buf[0] = MAXSESSION;
buf[1] = sizeof(sessiont);
if (fwrite(buf, sizeof(buf), 1, f) != 1)
}
while (0);
- log(0, 0, 0, 0, "Can't write state information: %s\n", strerror(errno));
+ LOG(0, 0, 0, 0, "Can't write state information: %s\n", strerror(errno));
unlink(STATEFILE);
}
if (!*config->l2tpsecret)
{
- log(0, 0, 0, 0, "LNS requested CHAP authentication, but no l2tp secret is defined\n");
+ LOG(0, 0, 0, 0, "LNS requested CHAP authentication, but no l2tp secret is defined\n");
return;
}
- log(4, 0, 0, 0, " Building challenge response for CHAP request\n");
+ LOG(4, 0, 0, 0, " Building challenge response for CHAP request\n");
*challenge_response = (char *)calloc(17, 1);
if (!config->numradiusservers)
{
- log(0, 0, 0, 0, "No RADIUS servers defined!\n");
+ LOG(0, 0, 0, 0, "No RADIUS servers defined!\n");
}
config->num_radfds = 2 << RADIUS_SHIFT;
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);
+ LOG(0,0,0,0, "Heartbeat timeout %d too low, adjusting to %d\n", config->cluster_hb_timeout, t);
config->cluster_hb_timeout = t;
}
}
else
{
- log(0, 0, 0, 0, "Can't write to PID file %s: %s\n", config->pid_file, strerror(errno));
+ LOG(0, 0, 0, 0, "Can't write to PID file %s: %s\n", config->pid_file, strerror(errno));
}
}
return;
}
- log(3, 0, 0, 0, "Reading config file %s\n", config->config_file);
+ LOG(3, 0, 0, 0, "Reading config file %s\n", config->config_file);
cli_do_file(f);
- log(3, 0, 0, 0, "Done reading config file\n");
+ LOG(3, 0, 0, 0, "Done reading config file\n");
fclose(f);
update_config();
}
CSTAT(call_sessionsetup);
-
- log(3, session[s].ip, s, t, "Doing session setup for session\n");
+ LOG(3, session[s].ip, s, t, "Doing session setup for session\n");
if (!session[s].ip || session[s].ip == 0xFFFFFFFE)
{
assign_ip_address(s);
- if (session[s].ip)
- 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");
+ if (!session[s].ip)
+ {
+ LOG(0, 0, s, t, " No IP allocated. The IP address pool is FULL!\n");
+ sessionshutdown(s, "No IP addresses available");
+ return 0;
+ }
+ LOG(3, 0, s, t, " No IP allocated. Assigned %s from pool\n",
+ inet_toa(htonl(session[s].ip)));
}
if (!session[s].unique_id)
{
// did this session just finish radius?
- log(3, session[s].ip, s, t, "Sending initial IPCP to client\n");
+ LOG(3, session[s].ip, s, t, "Sending initial IPCP to client\n");
sendipcp(t, s);
session[s].unique_id = ++last_id;
}
run_plugins(PLUGIN_NEW_SESSION, &data);
}
- // Force throttling on or off (Actually : refresh the current throttling status)
- // This has the advantage of cleaning up after another throttled user who may have left
- // firewall rules lying around
- throttle_session(s, session[s].throttle);
+ // Allocate TBFs if throttled
+ if (session[s].throttle_in || session[s].throttle_out)
+ throttle_session(s, session[s].throttle_in, session[s].throttle_out);
session[s].last_packet = time_now;
char *sessionip, *tunnelip;
sessionip = strdup(inet_toa(htonl(session[s].ip)));
tunnelip = strdup(inet_toa(htonl(tunnel[t].ip)));
- log(2, session[s].ip, s, t, "Login by %s at %s from %s (%s)\n",
+ LOG(2, session[s].ip, s, t, "Login by %s at %s from %s (%s)\n",
session[s].user, sessionip, tunnelip, tunnel[t].hostname);
if (sessionip) free(sessionip);
if (tunnelip) free(tunnelip);
if (new->ip_pool_index >= MAXIPPOOL ||
new->tunnel >= MAXTUNNEL)
{
- log(0,0,s,0, "Strange session update received!\n");
+ LOG(0,0,s,0, "Strange session update received!\n");
// FIXME! What to do here?
return 0;
}
// for walking the sessions to forward byte counts to the master.
config->cluster_highest_sessionid = s;
+ // TEMP: old session struct used a u32 to define the throttle
+ // speed for both up/down, new uses a u16 for each. Deal with
+ // sessions from an old master for migration.
+ if (new->throttle_out == 0 && new->tbf_out)
+ new->throttle_out = new->throttle_in;
+
memcpy(&session[s], new, sizeof(session[s])); // Copy over..
// Do fixups into address pool.
char path[256] = "";
snprintf(path, 256, PLUGINDIR "/%s.so", plugin_name);
- log(2, 0, 0, 0, "%soading plugin from %s\n", load ? "L" : "Un-l", path);
+ LOG(2, 0, 0, 0, "%soading plugin from %s\n", load ? "L" : "Un-l", path);
return dlopen(path, RTLD_NOW);
}
if (!p)
{
- log(1, 0, 0, 0, " Plugin load failed: %s\n", dlerror());
+ LOG(1, 0, 0, 0, " Plugin load failed: %s\n", dlerror());
return;
}
int *v = dlsym(p, "__plugin_api_version");
if (!v || *v != PLUGIN_API_VERSION)
{
- log(1, 0, 0, 0, " Plugin load failed: API version mismatch: %s\n", dlerror());
+ LOG(1, 0, 0, 0, " Plugin load failed: API version mismatch: %s\n", dlerror());
dlclose(p);
return;
}
{
if (!initfunc(&funcs))
{
- log(1, 0, 0, 0, " Plugin load failed: plugin_init() returned FALSE: %s\n", dlerror());
+ LOG(1, 0, 0, 0, " Plugin load failed: plugin_init() returned FALSE: %s\n", dlerror());
dlclose(p);
return;
}
void *x;
if (plugin_functions[i] && (x = dlsym(p, plugin_functions[i])))
{
- log(3, 0, 0, 0, " Supports function \"%s\"\n", plugin_functions[i]);
+ LOG(3, 0, 0, 0, " Supports function \"%s\"\n", plugin_functions[i]);
ll_push(plugins[i], x);
}
}
- log(2, 0, 0, 0, " Loaded plugin %s\n", plugin_name);
+ LOG(2, 0, 0, 0, " Loaded plugin %s\n", plugin_name);
}
static void run_plugin_done(void *plugin)
}
dlclose(p);
- log(2, 0, 0, 0, "Removed plugin %s\n", plugin_name);
+ LOG(2, 0, 0, 0, "Removed plugin %s\n", plugin_name);
}
int run_plugins(int plugin_type, void *data)
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);
}
if (param.send_response)
{
send_packet(controlfd, ntohl(addr->sin_addr.s_addr), ntohs(addr->sin_port), param.response, param.response_length);
- log(4, ntohl(addr->sin_addr.s_addr), 0, 0, "Sent Control packet response\n");
+ LOG(4, ntohl(addr->sin_addr.s_addr), 0, 0, "Sent Control packet response\n");
}
free(resp);
{
int i;
- log(1, 0, 0, 0, "Cleaning tunnels array\n");
+ LOG(1, 0, 0, 0, "Cleaning tunnels array\n");
for (i = 1; i < MAXTUNNEL; i++)
{
{
if (tunnel[i].state == TUNNELFREE)
{
- log(4, 0, 0, i, "Assigning tunnel ID %d\n", i);
+ LOG(4, 0, 0, i, "Assigning tunnel ID %d\n", i);
if (i > config->cluster_highest_tunnelid)
config->cluster_highest_tunnelid = i;
return i;
}
}
- log(0, 0, 0, 0, "Can't find a free tunnel! There shouldn't be this many in use!\n");
+ LOG(0, 0, 0, 0, "Can't find a free tunnel! There shouldn't be this many in use!\n");
return 0;
}
//
void become_master(void)
{
- int s;
+ int s, i;
run_plugins(PLUGIN_BECOME_MASTER, NULL);
- for (s = 1; s <= config->cluster_highest_sessionid ; ++s)
+ // running a bunch of iptables commands is slow and can cause
+ // the master to drop tunnels on takeover--kludge around the
+ // problem by forking for the moment (note: race)
+ if (!fork_and_close())
{
- if (!session[s].tunnel) // Not an in-use session.
- continue;
+ for (s = 1; s <= config->cluster_highest_sessionid ; ++s)
+ {
+ if (!session[s].tunnel) // Not an in-use session.
+ continue;
- run_plugins(PLUGIN_NEW_SESSION_MASTER, &session[s]);
+ run_plugins(PLUGIN_NEW_SESSION_MASTER, &session[s]);
+ }
+ exit(0);
}
-}
-
+ // add radius fds
+ for (i = 0; i < config->num_radfds; i++)
+ {
+ if (!radfds[i]) continue;
+ FD_SET(radfds[i], &readset);
+ if (radfds[i] > readset_n)
+ readset_n = radfds[i];
+ }
+}
int cmd_show_hist_idle(struct cli_def *cli, char *command, char **argv, int argc)
{
if (hidden_length > length - 8)
{
- log(1, 0, s, t, "Hidden length %d too long in AVP of length %d\n", (int) hidden_length, (int) length);
+ LOG(1, 0, s, t, "Hidden length %d too long in AVP of length %d\n", (int) hidden_length, (int) length);
return 0;
}
projects / l2tpns.git / blobdiff