welterde/l2tpns
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge back 2.0 branch changes

Browse source
This commit is contained in:
bodea 2005-02-14 06:58:38 +00:00
parent cd2e983aaf
commit 7825a26691
7 changed files with 91 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Changes
View file

@ -1,4 +1,4 @@
* Wed Feb 9 2005 Brendan O'Dea <bod@optusnet.com.au> 2.1.0 * Mon Feb 14 2005 Brendan O'Dea <bod@optusnet.com.au> 2.1.0
- Add IPv6 support from Jonathan McDowell. - Add IPv6 support from Jonathan McDowell.
- Add CHAP support from Jordan Hrycaj (work in progress). - Add CHAP support from Jordan Hrycaj (work in progress).
- Sanity check that cluster_send_session is not called from a child - Sanity check that cluster_send_session is not called from a child
@ -17,8 +17,21 @@
- Show time since last counter reset in "show counters". - Show time since last counter reset in "show counters".
- Remove "save_state" option. Not maintained anymore; use clustering - Remove "save_state" option. Not maintained anymore; use clustering
to retain state across restarts. to retain state across restarts.
- Fix off-by-one in session/tunnel table initialisation. - Ensure that sessionkill is not called on an unopened session (borks
the freelist).
- Bump MAXSESSION to 60K. - Bump MAXSESSION to 60K.
- Fix off-by-one errors in session/tunnel initialisation and
sessiont <-> sessionidt functions.
- Use session[s].opened consistently when checking for in-use sessions
(rather than session[s].tunnel).
- Use <= cluster_highest_sessionid rather than < MAXSESSION in a
couple of loops.
- Don't kill a whole tunnel if we're out of sessions.
- Change session[s].ip to 0 if set from RADIUS to 255.255.255.254;
avoids the possibility that it will be interpreted as a valid IP
address.
- Avoid a possible buffer overflow in processpap.
- Kill session if authentication was rejected.
* Fri Dec 17 2004 Brendan O'Dea <bod@optusnet.com.au> 2.0.13 * Fri Dec 17 2004 Brendan O'Dea <bod@optusnet.com.au> 2.0.13
- Better cluster master collision resolution: keep a counter of state - Better cluster master collision resolution: keep a counter of state

19
cluster.c
View file

@ -1,6 +1,6 @@
// L2TPNS Clustering Stuff // L2TPNS Clustering Stuff
char const *cvs_id_cluster = "$Id: cluster.c,v 1.30 2005/02/09 02:38:51 bodea Exp $"; char const *cvs_id_cluster = "$Id: cluster.c,v 1.31 2005/02/14 06:58:38 bodea Exp $";
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -571,10 +571,13 @@ void cluster_check_master(void)
++count; ++count;
} }
if (session[i].tunnel == T_FREE) { // Unused session. Add to free list. if (!session[i].opened) { // Unused session. Add to free list.
memset(&session[i], 0, sizeof(session[i]));
session[i].tunnel = T_FREE;
session[last_free].next = i; session[last_free].next = i;
session[i].next = 0; session[i].next = 0;
last_free = i; last_free = i;
continue;
} }
// Reset all the idle timeouts.. // Reset all the idle timeouts..
@ -593,11 +596,9 @@ void cluster_check_master(void)
if (session[i].unique_id >= high_unique_id) // This is different to the index into the session table!!! if (session[i].unique_id >= high_unique_id) // This is different to the index into the session table!!!
high_unique_id = session[i].unique_id+1; high_unique_id = session[i].unique_id+1;
session[i].tbf_in = session[i].tbf_out = 0; // Remove stale pointers from old master. session[i].tbf_in = session[i].tbf_out = 0; // Remove stale pointers from old master.
throttle_session(i, session[i].throttle_in, session[i].throttle_out); throttle_session(i, session[i].throttle_in, session[i].throttle_out);
if (session[i].tunnel != T_FREE && i > config->cluster_highest_sessionid)
config->cluster_highest_sessionid = i; config->cluster_highest_sessionid = i;
} }
@ -650,11 +651,13 @@ static void cluster_check_sessions(int highsession, int freesession_ptr, int hig
config->cluster_undefined_sessions = 0; config->cluster_undefined_sessions = 0;
for (i = 1 ; i < MAXSESSION; ++i) { for (i = 1 ; i < MAXSESSION; ++i) {
if (i > highsession) { if (i > highsession) {
session[i].tunnel = T_FREE; // Defined. if (session[i].tunnel == T_UNDEF) session[i].tunnel = T_FREE; // Defined.
continue; continue;
} }
if (session[i].tunnel != T_UNDEF) if (session[i].tunnel != T_UNDEF)
continue; continue;
if (session[i].tunnel == T_UNDEF)
++config->cluster_undefined_sessions; ++config->cluster_undefined_sessions;
} }
@ -663,11 +666,11 @@ static void cluster_check_sessions(int highsession, int freesession_ptr, int hig
config->cluster_undefined_tunnels = 0; config->cluster_undefined_tunnels = 0;
for (i = 1 ; i < MAXTUNNEL; ++i) { for (i = 1 ; i < MAXTUNNEL; ++i) {
if (i > hightunnel) { if (i > hightunnel) {
tunnel[i].state = TUNNELFREE; // Defined. if (tunnel[i].state == TUNNELUNDEF) tunnel[i].state = TUNNELFREE; // Defined.
continue; continue;
} }
if (tunnel[i].state != TUNNELUNDEF)
continue; if (tunnel[i].state == TUNNELUNDEF)
++config->cluster_undefined_tunnels; ++config->cluster_undefined_tunnels;
} }

71
l2tpns.c
View file

@ -4,7 +4,7 @@
// Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
// vim: sw=8 ts=8 // vim: sw=8 ts=8
char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.83 2005/02/09 00:45:34 bodea Exp $"; char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.84 2005/02/14 06:58:39 bodea Exp $";
#include <arpa/inet.h> #include <arpa/inet.h>
#include <assert.h> #include <assert.h>
@ -660,7 +660,7 @@ sessionidt sessionbyip(in_addr_t ip)
int s = lookup_ipmap(ip); int s = lookup_ipmap(ip);
CSTAT(sessionbyip); CSTAT(sessionbyip);
if (s > 0 && s < MAXSESSION && session[s].tunnel) if (s > 0 && s < MAXSESSION && session[s].opened)
return (sessionidt) s; return (sessionidt) s;
return 0; return 0;
@ -679,7 +679,7 @@ sessionidt sessionbyipv6(struct in6_addr ip)
s = lookup_ipv6map(ip); s = lookup_ipv6map(ip);
} }
if (s > 0 && s < MAXSESSION && session[s].tunnel) if (s > 0 && s < MAXSESSION && session[s].opened)
return s; return s;
return 0; return 0;
@ -815,8 +815,11 @@ sessionidt sessionbyuser(char *username)
int s; int s;
CSTAT(sessionbyuser); CSTAT(sessionbyuser);
for (s = 1; s < MAXSESSION ; ++s) for (s = 1; s <= config->cluster_highest_sessionid ; ++s)
{ {
if (!session[s].opened)
continue;
if (session[s].walled_garden) if (session[s].walled_garden)
continue; // Skip walled garden users. continue; // Skip walled garden users.
@ -858,17 +861,16 @@ void send_garp(in_addr_t ip)
sendarp(ifr.ifr_ifindex, mac, ip); sendarp(ifr.ifr_ifindex, mac, ip);
} }
// Find session by username, 0 for not found
static sessiont *sessiontbysessionidt(sessionidt s) static sessiont *sessiontbysessionidt(sessionidt s)
{ {
if (!s || s > MAXSESSION) return NULL; if (!s || s >= MAXSESSION) return NULL;
return &session[s]; return &session[s];
} }
static sessionidt sessionidtbysessiont(sessiont *s) static sessionidt sessionidtbysessiont(sessiont *s)
{ {
sessionidt val = s-session; sessionidt val = s-session;
if (s < session || val > MAXSESSION) return 0; if (s < session || val >= MAXSESSION) return 0;
return val; return val;
} }
@ -1357,7 +1359,7 @@ static void controladd(controlt * c, tunnelidt t, sessionidt s)
// //
void throttle_session(sessionidt s, int rate_in, int rate_out) void throttle_session(sessionidt s, int rate_in, int rate_out)
{ {
if (!session[s].tunnel) if (!session[s].opened)
return; // No-one home. return; // No-one home.
if (!*session[s].user) if (!*session[s].user)
@ -1395,7 +1397,7 @@ void throttle_session(sessionidt s, int rate_in, int rate_out)
// add/remove filters from session (-1 = no change) // add/remove filters from session (-1 = no change)
static void filter_session(sessionidt s, int filter_in, int filter_out) static void filter_session(sessionidt s, int filter_in, int filter_out)
{ {
if (!session[s].tunnel) if (!session[s].opened)
return; // No-one home. return; // No-one home.
if (!*session[s].user) if (!*session[s].user)
@ -1438,9 +1440,9 @@ void sessionshutdown(sessionidt s, char *reason)
CSTAT(sessionshutdown); CSTAT(sessionshutdown);
if (!session[s].tunnel) if (!session[s].opened)
{ {
LOG(3, s, session[s].tunnel, "Called sessionshutdown on a session with no tunnel.\n"); LOG(3, s, session[s].tunnel, "Called sessionshutdown on an unopened session.\n");
return; // not a live session return; // not a live session
} }
@ -1451,7 +1453,7 @@ void sessionshutdown(sessionidt s, char *reason)
run_plugins(PLUGIN_KILL_SESSION, &data); run_plugins(PLUGIN_KILL_SESSION, &data);
} }
if (session[s].opened && !walled_garden && !session[s].die) if (!walled_garden && !session[s].die)
{ {
// RADIUS Stop message // RADIUS Stop message
uint16_t r = session[s].radius; uint16_t r = session[s].radius;
@ -1514,7 +1516,7 @@ void sessionshutdown(sessionidt s, char *reason)
} }
if (!session[s].die) if (!session[s].die)
session[s].die = now() + 150; // Clean up in 15 seconds session[s].die = TIME + 150; // Clean up in 15 seconds
// update filter refcounts // update filter refcounts
if (session[s].filter_in) ip_filters[session[s].filter_in - 1].used--; if (session[s].filter_in) ip_filters[session[s].filter_in - 1].used--;
@ -1589,12 +1591,21 @@ void sendipcp(tunnelidt t, sessionidt s)
} }
// kill a session now // kill a session now
static void sessionkill(sessionidt s, char *reason) void sessionkill(sessionidt s, char *reason)
{ {
CSTAT(sessionkill); CSTAT(sessionkill);
session[s].die = now(); if (!session[s].opened) // not alive
return;
if (session[s].next)
{
LOG(0, s, session[s].tunnel, "Tried to kill a session with next pointer set (%d)\n", session[s].next);
return;
}
session[s].die = TIME;
sessionshutdown(s, reason); // close radius/routes, etc. sessionshutdown(s, reason); // close radius/routes, etc.
if (session[s].radius) if (session[s].radius)
radiusclear(session[s].radius, s); // cant send clean accounting data, session is killed radiusclear(session[s].radius, s); // cant send clean accounting data, session is killed
@ -1636,7 +1647,7 @@ static void tunnelkill(tunnelidt t, char *reason)
controlfree = c; controlfree = c;
} }
// kill sessions // kill sessions
for (s = 1; s < MAXSESSION; s++) for (s = 1; s <= config->cluster_highest_sessionid ; ++s)
if (session[s].tunnel == t) if (session[s].tunnel == t)
sessionkill(s, reason); sessionkill(s, reason);
@ -1663,12 +1674,12 @@ static void tunnelshutdown(tunnelidt t, char *reason)
LOG(1, 0, t, "Shutting down tunnel %d (%s)\n", t, reason); LOG(1, 0, t, "Shutting down tunnel %d (%s)\n", t, reason);
// close session // close session
for (s = 1; s < MAXSESSION; s++) for (s = 1; s <= config->cluster_highest_sessionid ; ++s)
if (session[s].tunnel == t) if (session[s].tunnel == t)
sessionshutdown(s, reason); sessionshutdown(s, reason);
tunnel[t].state = TUNNELDIE; tunnel[t].state = TUNNELDIE;
tunnel[t].die = now() + 700; // Clean up in 70 seconds tunnel[t].die = TIME + 700; // Clean up in 70 seconds
cluster_send_tunnel(t); cluster_send_tunnel(t);
// TBA - should we wait for sessions to stop? // TBA - should we wait for sessions to stop?
{ // Send StopCCN { // Send StopCCN
@ -2202,7 +2213,8 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
if (!sessionfree) if (!sessionfree)
{ {
STAT(session_overflow); STAT(session_overflow);
tunnelshutdown(t, "No free sessions"); LOG(1, 0, t, "No free sessions");
return;
} }
else else
{ {
@ -2226,7 +2238,7 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
c = controlnew(11); // sending ICRP c = controlnew(11); // sending ICRP
session[s].id = sessionid++; session[s].id = sessionid++;
session[s].opened = time(NULL); session[s].opened = time_now;
session[s].tunnel = t; session[s].tunnel = t;
session[s].far = asession; session[s].far = asession;
session[s].last_packet = time_now; session[s].last_packet = time_now;
@ -2306,7 +2318,7 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
l -= 2; l -= 2;
} }
if (s && !session[s].tunnel) // Is something wrong?? if (s && !session[s].opened) // Is something wrong??
{ {
if (!config->cluster_iam_master) if (!config->cluster_iam_master)
{ {
@ -2316,9 +2328,7 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
} }
LOG(1, s, t, "UDP packet contains session %d but no session[%d].tunnel " LOG(1, s, t, "UDP packet contains session which is not opened. Dropping packet.\n");
"exists (LAC said tunnel = %d). Dropping packet.\n", s, s, t);
STAT(tunnel_rx_errors); STAT(tunnel_rx_errors);
return; return;
} }
@ -2525,7 +2535,7 @@ static int regular_cleanups(void)
if (s > config->cluster_highest_sessionid) if (s > config->cluster_highest_sessionid)
s = 1; s = 1;
if (!session[s].tunnel) // Session isn't in use if (!session[s].opened) // Session isn't in use
continue; continue;
if (!session[s].die && session[s].ip && !(session[s].flags & SF_IPCP_ACKED)) if (!session[s].die && session[s].ip && !(session[s].flags & SF_IPCP_ACKED))
@ -3269,8 +3279,9 @@ void rebuild_address_pool(void)
for (i = 0; i < MAXSESSION; ++i) for (i = 0; i < MAXSESSION; ++i)
{ {
int ipid; int ipid;
if (!session[i].ip || !session[i].tunnel) if (!(session[i].opened && session[i].ip))
continue; continue;
ipid = - lookup_ipmap(htonl(session[i].ip)); ipid = - lookup_ipmap(htonl(session[i].ip));
if (session[i].ip_pool_index < 0) if (session[i].ip_pool_index < 0)
@ -4016,7 +4027,7 @@ int sessionsetup(tunnelidt t, sessionidt s)
LOG(3, s, t, "Doing session setup for session\n"); LOG(3, s, t, "Doing session setup for session\n");
if (!session[s].ip || session[s].ip == 0xFFFFFFFE) if (!session[s].ip)
{ {
assign_ip_address(s); assign_ip_address(s);
if (!session[s].ip) if (!session[s].ip)
@ -4619,7 +4630,7 @@ void become_master(void)
{ {
for (s = 1; s <= config->cluster_highest_sessionid ; ++s) for (s = 1; s <= config->cluster_highest_sessionid ; ++s)
{ {
if (!session[s].tunnel) // Not an in-use session. if (!session[s].opened) // Not an in-use session.
continue; continue;
run_plugins(PLUGIN_NEW_SESSION_MASTER, &session[s]); run_plugins(PLUGIN_NEW_SESSION_MASTER, &session[s]);
@ -4651,7 +4662,7 @@ int cmd_show_hist_idle(struct cli_def *cli, char *command, char **argv, int argc
for (s = 1; s <= config->cluster_highest_sessionid ; ++s) for (s = 1; s <= config->cluster_highest_sessionid ; ++s)
{ {
int idle; int idle;
if (!session[s].tunnel) if (!session[s].opened)
continue; continue;
idle = time_now - session[s].last_packet; idle = time_now - session[s].last_packet;
@ -4689,7 +4700,7 @@ int cmd_show_hist_open(struct cli_def *cli, char *command, char **argv, int argc
for (s = 1; s <= config->cluster_highest_sessionid ; ++s) for (s = 1; s <= config->cluster_highest_sessionid ; ++s)
{ {
int open = 0, d; int open = 0, d;
if (!session[s].tunnel) if (!session[s].opened)
continue; continue;
d = time_now - session[s].opened; d = time_now - session[s].opened;

3
l2tpns.h
View file

@ -1,5 +1,5 @@
// L2TPNS Global Stuff // L2TPNS Global Stuff
// $Id: l2tpns.h,v 1.56 2005/02/09 02:39:05 bodea Exp $ // $Id: l2tpns.h,v 1.57 2005/02/14 06:58:39 bodea Exp $
#ifndef __L2TPNS_H__ #ifndef __L2TPNS_H__
#define __L2TPNS_H__ #define __L2TPNS_H__
@ -617,6 +617,7 @@ sessionidt sessionbyip(in_addr_t ip);
sessionidt sessionbyipv6(struct in6_addr ip); sessionidt sessionbyipv6(struct in6_addr ip);
sessionidt sessionbyuser(char *username); sessionidt sessionbyuser(char *username);
void random_data(uint8_t *buf, int len); void random_data(uint8_t *buf, int len);
void sessionkill(sessionidt s, char *reason);
void sessionshutdown(sessionidt s, char *reason); void sessionshutdown(sessionidt s, char *reason);
void send_garp(in_addr_t ip); void send_garp(in_addr_t ip);
void tunnelsend(uint8_t *buf, uint16_t l, tunnelidt t); void tunnelsend(uint8_t *buf, uint16_t l, tunnelidt t);

2
l2tpns.spec
View file

@ -43,5 +43,5 @@ rm -rf %{buildroot}
%attr(644,root,root) /usr/share/man/man[58]/* %attr(644,root,root) /usr/share/man/man[58]/*
%changelog %changelog
* Wed Feb 9 2005 Brendan O'Dea <bod@optusnet.com.au> 2.1.0-1 * Mon Feb 14 2005 Brendan O'Dea <bod@optusnet.com.au> 2.1.0-1
- 2.1.0 release, see /usr/share/doc/l2tpns-2.1.0/Changes - 2.1.0 release, see /usr/share/doc/l2tpns-2.1.0/Changes

7
ppp.c
View file

@ -1,6 +1,6 @@
// L2TPNS PPP Stuff // L2TPNS PPP Stuff
char const *cvs_id_ppp = "$Id: ppp.c,v 1.43 2005/01/25 04:38:49 bodea Exp $"; char const *cvs_id_ppp = "$Id: ppp.c,v 1.44 2005/02/14 06:58:39 bodea Exp $";
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -60,13 +60,18 @@ void processpap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
{ {
uint8_t *b = p; uint8_t *b = p;
b += 4; b += 4;
user[0] = pass[0] = 0;
if (*b && *b < sizeof(user)) if (*b && *b < sizeof(user))
{
memcpy(user, b + 1, *b); memcpy(user, b + 1, *b);
user[*b] = 0; user[*b] = 0;
b += 1 + *b; b += 1 + *b;
if (*b && *b < sizeof(pass)) if (*b && *b < sizeof(pass))
{
memcpy(pass, b + 1, *b); memcpy(pass, b + 1, *b);
pass[*b] = 0; pass[*b] = 0;
}
}
LOG(3, s, t, "PAP login %s/%s\n", user, pass); LOG(3, s, t, "PAP login %s/%s\n", user, pass);
} }
if (session[s].ip || !session[s].radius) if (session[s].ip || !session[s].radius)

9
radius.c
View file

@ -1,6 +1,6 @@
// L2TPNS Radius Stuff // L2TPNS Radius Stuff
char const *cvs_id_radius = "$Id: radius.c,v 1.23 2005/01/25 04:19:06 bodea Exp $"; char const *cvs_id_radius = "$Id: radius.c,v 1.24 2005/02/14 06:58:39 bodea Exp $";
#include <time.h> #include <time.h>
#include <stdio.h> #include <stdio.h>
@ -470,6 +470,9 @@ void processrad(uint8_t *buf, int len, char socket_index)
session[s].ip_pool_index = -1; session[s].ip_pool_index = -1;
LOG(3, s, session[s].tunnel, " Radius reply contains IP address %s\n", LOG(3, s, session[s].tunnel, " Radius reply contains IP address %s\n",
fmtaddr(htonl(session[s].ip), 0)); fmtaddr(htonl(session[s].ip), 0));
if (session[s].ip == 0xFFFFFFFE)
session[s].ip = 0; // assign from pool
} }
else if (*p == 135) else if (*p == 135)
{ {
@ -649,8 +652,8 @@ void processrad(uint8_t *buf, int len, char socket_index)
} }
else if (r_code == AccessReject) else if (r_code == AccessReject)
{ {
LOG(2, s, session[s].tunnel, " Authentication denied for %s\n", session[s].user); LOG(2, s, session[s].tunnel, " Authentication rejected for %s\n", session[s].user);
sessionshutdown(s, "Authentication denied"); sessionkill(s, "Authentication rejected");
break; break;
} }