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

* Fri Mar 5 2004 David Parrish <david@dparrish.com> 1.1.0

Browse source 
- Change all strcpy() calls to strncpy() to avoid buffer overflow potential
- Add ICMP host unreachable support
- Logging to syslog if log_file = "syslog:facility"
- Now requires libcli 1.5
- All configuration moves to a config structure
- Ability to modify and write config on the fly through command-line interface
- Config file support is removed, and now handled by the cli
- Show hostname in cli prompt
- Keep current state type for tunnels
- Add uptime command do CLI, which also shows real-time bandwidth utilisation
- Add goodbye command to cluster master, which forces droppping a slave
- Cache IP address allocation, so that reconnecting users get the same address
- Fix tunnel resend timeouts, so that dead tunnels will be cleaned up
- Allocate tunnels and radius without using a linked list which had issues
- Fix some off-by-one errors in tunnel and session and radius arrays
- Save and reload ip address pool when dieing
- Check version and size of reloaded data when restarting
- Remove plugin_config support
- Remove old support for TBF which didn't work anyway. HTB is required to do throttling now.
- Add COPYING and Changes files
This commit is contained in:
David Parrish 2004-03-05 00:09:03 +00:00
parent 7c1104efff
commit fc0a363208
22 changed files with 1731 additions and 1248 deletions
Download patch file Download diff file Expand all files Collapse all files

41
cluster_master.c
View file

@ -1,5 +1,5 @@
// L2TPNS Cluster Master
// $Id: cluster_master.c,v 1.1 2003-12-16 07:07:39 fred_nerk Exp $
// $Id: cluster_master.c,v 1.2 2004-03-05 00:09:03 fred_nerk Exp $
#include <stdio.h>
#include <netinet/in.h>
@ -51,6 +51,7 @@ int handle_hello(char *buf, int l, struct sockaddr_in *src_addr, uint32_t addr);
int handle_tunnel(char *buf, int l, uint32_t addr);
int handle_session(char *buf, int l, uint32_t addr);
int handle_ping(char *buf, int l, uint32_t addr);
int handle_goodbye(char *buf, int l, uint32_t addr);
int backup_up(slave *s);
int backup_down(slave *s);
int return_state(slave *s);
@ -91,7 +92,7 @@ int main(int argc, char *argv[])
signal(SIGCHLD, sigchild_handler);
log(0, "Cluster Manager $Id: cluster_master.c,v 1.1 2003-12-16 07:07:39 fred_nerk Exp $ starting\n");
log(0, "Cluster Manager $Id: cluster_master.c,v 1.2 2004-03-05 00:09:03 fred_nerk Exp $ starting\n");
to.tv_sec = 1;
to.tv_usec = 0;
@ -156,6 +157,7 @@ int main(int argc, char *argv[])
int processmsg(char *buf, int l, struct sockaddr_in *src_addr)
{
slave *s;
char mtype;
uint32_t addr;
@ -168,6 +170,16 @@ int processmsg(char *buf, int l, struct sockaddr_in *src_addr)
mtype = *buf; buf++; l--;
if (mtype != C_GOODBYE && (s = find_slave(addr)) && s->down)
{
char *hostname;
hostname = calloc(l + 1, 1);
memcpy(hostname, buf, l);
log(1, "Slave \"%s\" (for %s) has come back.\n", hostname, inet_toa(s->ip_address));
backup_down(s);
free(hostname);
}
switch (mtype)
{
case C_HELLO:
@ -187,6 +199,10 @@ int processmsg(char *buf, int l, struct sockaddr_in *src_addr)
if (!find_slave(addr)) handle_hello((char *)(buf + 1), *(char *)buf, src_addr, addr);
handle_session(buf, l, addr);
break;
case C_GOODBYE:
if (!find_slave(addr)) break;
handle_goodbye(buf, l, addr);
break;
}
return mtype;
}
@ -478,3 +494,24 @@ int backup_down(slave *s)
return 0;
}
int handle_goodbye(char *buf, int l, uint32_t addr)
{
int i;
slave *s;
// Is this a slave we have state information for?
if ((s = find_slave(addr)))
{
log(0, "Received goodbye for slave %s\n", s->hostname);
ll_delete(slaves, s);
for (i = 0; i < s->num_tunnels; i++)
if (s->tunnels[i]) free(s->tunnels[i]);
for (i = 0; i < s->num_sessions; i++)
if (s->sessions[i]) free(s->sessions[i]);
if (s->hostname) free(s->hostname);
free(s);
}
return 0;
}