* Wed Jun 23 2004 David Parrish <david@dparrish.com> 2.0.0

- Major release
- Completely replace active/standby clustering with a new peer-to-peer
  clustering method which allows much greater throughput and is a lot more fault
  tolerant
- Add internal tbf implementation for throttling without relying on tc and
  kernel HTB
- Add support for iBGP and eBGP to advertise routes
- Add cli commands "show cluster", "show bgp", "show ipcache", "show throttle",
  "show tbf", "suspend bgp", "restart bgp", "show user"
- Interception destination must be set per-user
- If SMP machine, allow use of SCHED_FIFO, which should improve performance
- Added config option to send GARP at startup
- Added plugin_become_master and plugin_new_session_master plugin hooks
- Remove useless sessionsendarp(). This isn't needed now that we are using TUN
  instead of TAP.
- ICMP rate limiting so not every unreachable packet is replied with an ICMP
  unreachable message
- mangle table is not required on anything but the cluster master, so slaves
  will drop the mangle table and attempt to unload the ip_conntrack module
- Statically assigned IP addresses (by Radius) work now
- Add -d command-line flag to detach and become a daemon
- Configuration file is now "/etc/l2tpns/startup-config"
- Reduced MIN_IP_SIZE to 0x19 to stop a pile of Short IP warnings
- Resend initial IPCP request until it's acknowleged by the client
- Better radius session cleanup logic
- Many miscellaenous bugfixes and performance enhancements
- Thanks to Michael O'Reilly and Brendan O'Dea for most of these new features
This commit is contained in:
David Parrish 2004-06-23 03:52:24 +00:00
parent b4451ee1a4
commit c239d4b228
31 changed files with 5417 additions and 1844 deletions

View file

@ -1,19 +1,85 @@
// L2TPNS Clustering Stuff
// $Id: cluster.h,v 1.2 2004-03-05 00:09:03 fred_nerk Exp $
// $Id: cluster.h,v 1.3 2004-06-23 03:52:24 fred_nerk Exp $
#define C_HELLO 1
#define C_HELLO_RESPONSE 2
#ifndef __CLUSTER_H__
#define __CLUSTER_H__
#define C_HEARTBEAT 1
#define C_ACK 2
#define C_PING 3
#define C_TUNNEL 4
#define C_SESSION 5
#define C_TUNNEL 4 // Tunnel structure.
#define C_SESSION 5 // Session structure.
#define C_GOODBYE 6
#define C_LASTSEEN 7 // Tell master the last heartbeat that I handled.
#define C_KILL 8 // Tell a slave to die.
#define C_FORWARD 9 // Forwarded packet..
#define C_BYTES 10 // Update byte counters.
#define C_THROTTLE 11 // A packet for the master to throttle. (The TBF tells direction).
#define C_CSESSION 12 // Compressed session structure.
#define C_CTUNNEL 13 // Compressed tunnel structure.
#define C_GARDEN 14 // Gardened packet
#define HB_VERSION 2 // Protocol version number..
#define HB_MAX_SEQ (1<<30) // Maximum sequence number. (MUST BE A POWER OF 2!)
#define HB_HISTORY_SIZE 64 // How many old heartbeats we remember?? (Must be a factor of HB_MAX_SEQ)
#define PING_INTERVAL 5 // 0.5 seconds. Needs to be short to keep session tables fresh.
#define HB_TIMEOUT (15*2*PING_INTERVAL) // 15 seconds without heartbeat triggers an election..
#define CLUSTERPORT 32792
#define CLUSTERCLIENTPORT 32793
#define UDP 17
#define TIMEOUT 20
#define IL sizeof(int)
int cluster_init(uint32_t bind_address, int server);
int cluster_send_message(unsigned long ip_address, uint32_t vip, char type, void *data, int datalen);
int processcluster(char *buf, int l);
#define CLUSTER_MAX_SIZE 32 // No more than 32 machines in a cluster!
#define DEFAULT_MCAST_ADDR "239.192.13.13" // Need an assigned number!
#define DEFAULT_MCAST_INTERFACE "eth0"
typedef struct {
u32 version; // protocol version.
u32 seq; // Sequence number for this heatbeat.
u32 basetime; // What time I started
u32 clusterid; // Id for this cluster?
u32 highsession; // Id of the highest in-use session.
u32 freesession; // Id of the first free session.
u32 hightunnel; // Id of the highest used tunnel.
u32 size_sess; // Size of the session structure.
u32 size_tunn; // size of the tunnel structure.
char reserved[128 - 9*sizeof(u32)]; // Pad out to 128 bytes.
} heartt;
typedef struct { /* Used to update byte counters on the */
/* master. */
u32 sid;
u32 in;
u32 out;
} bytest;
typedef struct {
u32 addr; //
u32 ver; // version of structure.
u32 undef; // Number of undefined structures. 0 if up-to-date.
u32 basetime; // start time of this peer.
} pingt;
int cluster_init();
int processcluster(char *buf, int size, u32 addr);
int cluster_forward_packet(char *buf, int size, u32 addr);
int cluster_send_session(int sid);
int cluster_send_tunnel(int tid);
int master_forward_packet(char * data, int size, u32 addr, int port);
int master_throttle_packet(int tid, char * data, int size);
int master_garden_packet(sessionidt s, char * data, int size);
void master_update_counts(void);
void cluster_send_ping(time_t basetime);
void cluster_heartbeat(int highsession, int freesession, int hightunnel);
void cluster_check_master(void);
int show_cluster(struct cli_def *cli, char *command, char **argv, int argc);
#endif /* __CLUSTER_H__ */