#include <malloc.h>
#include <errno.h>
#include <libcli.h>
+#include <linux/rtnetlink.h>
#include "l2tpns.h"
#include "cluster.h"
#include "util.h"
#include "tbf.h"
+#include "pppoe.h"
#ifdef BGP
#include "bgp.h"
//
// The master just processes the payload as if it had
// received it off the tun device.
-//
+//(note: THIS ROUTINE WRITES TO pack[-6]).
int master_forward_packet(uint8_t *data, int size, in_addr_t addr, int port)
{
- return _forward_packet(data, size, addr, port, C_FORWARD);
+ uint8_t *p = data - (3 * sizeof(uint32_t));
+ uint8_t *psave = p;
+
+ if (!config->cluster_master_address) // No election has been held yet. Just skip it.
+ return -1;
+
+ LOG(4, 0, 0, "Forwarding packet from %s to master (size %d)\n", fmtaddr(addr, 0), size);
+
+ STAT(c_forwarded);
+ add_type(&p, C_FORWARD, addr, (uint8_t *) &port, sizeof(port)); // ick. should be uint16_t
+
+ return peer_send_data(config->cluster_master_address, psave, size + (3 * sizeof(uint32_t)));
+}
+
+// Forward PPPOE packet to the master.
+//(note: THIS ROUTINE WRITES TO pack[-4]).
+int master_forward_pppoe_packet(uint8_t *data, int size, uint8_t codepad)
+{
+ uint8_t *p = data - (2 * sizeof(uint32_t));
+ uint8_t *psave = p;
+
+ if (!config->cluster_master_address) // No election has been held yet. Just skip it.
+ return -1;
+
+ LOG(4, 0, 0, "Forward PPPOE packet to master, code %s (size %d)\n", get_string_codepad(codepad), size);
+
+ STAT(c_forwarded);
+ add_type(&p, C_PPPOE_FORWARD, codepad, NULL, 0);
+
+ return peer_send_data(config->cluster_master_address, psave, size + (2 * sizeof(uint32_t)));
}
// Forward a DAE RADIUS packet to the master.
}
+//
+// Forward a MPPP packet to the master for handling.
+//
+// (Note that this must be called with the tun header
+// as the start of the data).
+// (i.e. this routine writes to data[-8]).
+int master_forward_mppp_packet(sessionidt s, uint8_t *data, int size)
+{
+ uint8_t *p = data - (2 * sizeof(uint32_t));
+ uint8_t *psave = p;
+
+ if (!config->cluster_master_address) // No election has been held yet. Just skip it.
+ return -1;
+
+ LOG(4, 0, 0, "Forward MPPP packet to master (size %d)\n", size);
+
+ add_type(&p, C_MPPP_FORWARD, s, NULL, 0);
+
+ return peer_send_data(config->cluster_master_address, psave, size + (2 * sizeof(uint32_t)));
+
+}
+
//
// Send a chunk of data as a heartbeat..
// We save it in the history buffer as we do so.
if (!config->cluster_master_address) // If we don't have a master, skip it for a while.
return;
- // C_BYTES format changed in 2.1.0 (cluster version 5)
- // during upgrade from previous versions, hang onto our counters
- // for a bit until the new master comes up
- if (config->cluster_last_hb_ver < 5)
- return;
-
i = MAX_B_RECS * 5; // Examine max 3000 sessions;
if (config->cluster_highest_sessionid > i)
i = config->cluster_highest_sessionid;
//
void cluster_check_master(void)
{
- int i, count, tcount, bcount, high_unique_id = 0;
+ int i, count, high_unique_id = 0;
int last_free = 0;
clockt t = TIME;
static int probed = 0;
// to become a master!!!
config->cluster_iam_master = 1;
+ pppoe_send_garp(); // gratuitous arp of the pppoe interface
LOG(0, 0, 0, "I am declaring myself the master!\n");
// Count the highest used tunnel number as well.
//
config->cluster_highest_tunnelid = 0;
- for (i = 0, tcount = 0; i < MAXTUNNEL; ++i) {
+ for (i = 0; i < MAXTUNNEL; ++i) {
if (tunnel[i].state == TUNNELUNDEF)
tunnel[i].state = TUNNELFREE;
// Count the highest used bundle number as well.
//
config->cluster_highest_bundleid = 0;
- for (i = 0, bcount = 0; i < MAXBUNDLE; ++i) {
+ for (i = 0; i < MAXBUNDLE; ++i) {
if (bundle[i].state == BUNDLEUNDEF)
bundle[i].state = BUNDLEFREE;
increment_counter(&session[i].cout, &session[i].cout_wrap, sess_local[i].cout);
session[i].cin_delta += sess_local[i].cin;
session[i].cout_delta += sess_local[i].cout;
+ session[i].coutgrp_delta += sess_local[i].cout;
session[i].pin += sess_local[i].pin;
session[i].pout += sess_local[i].pout;
exit(1);
}
- LOG(3, 0, 0, "Sending v%d heartbeat #%d, change #%" PRIu64 " with %d changes "
+ LOG(4, 0, 0, "Sending v%d heartbeat #%d, change #%" PRIu64 " with %d changes "
"(%d x-sess, %d x-bundles, %d x-tunnels, %d highsess, %d highbund, %d hightun, size %d)\n",
HB_VERSION, h.seq, h.table_version, config->cluster_num_changes,
count, bcount, tcount, config->cluster_highest_sessionid, config->cluster_highest_bundleid,
int i;
for (i = 0 ; i < config->cluster_num_changes ; ++i)
- if ( cluster_changes[i].id == id &&
- cluster_changes[i].type == type)
- return 0; // Already marked for change.
+ {
+ if ( cluster_changes[i].id == id && cluster_changes[i].type == type)
+ {
+ // Already marked for change, remove it
+ --config->cluster_num_changes;
+ memmove(&cluster_changes[i],
+ &cluster_changes[i+1],
+ (config->cluster_num_changes - i) * sizeof(cluster_changes[i]));
+ break;
+ }
+ }
- cluster_changes[i].type = type;
- cluster_changes[i].id = id;
+ cluster_changes[config->cluster_num_changes].type = type;
+ cluster_changes[config->cluster_num_changes].id = id;
++config->cluster_num_changes;
if (config->cluster_num_changes > MAX_CHANGES)
return 1;
}
-
// A particular session has been changed!
int cluster_send_session(int sid)
{
session[b->sid].cin_delta += b->cin;
session[b->sid].cout_delta += b->cout;
+ session[b->sid].coutgrp_delta += b->cout;
if (b->cin)
session[b->sid].last_packet = session[b->sid].last_data = time_now;
}
-// pre v5 heartbeat session structure
+// pre v6 heartbeat session structure
struct oldsession {
sessionidt next;
sessionidt far;
tunnelidt tunnel;
+ uint8_t flags;
+ struct {
+ uint8_t phase;
+ uint8_t lcp:4;
+ uint8_t ipcp:4;
+ uint8_t ipv6cp:4;
+ uint8_t ccp:4;
+ } ppp;
+ char reserved_1[2];
in_addr_t ip;
int ip_pool_index;
- unsigned long unique_id;
- uint16_t nr;
- uint16_t ns;
+ uint32_t unique_id;
+ char reserved_2[4];
uint32_t magic;
- uint32_t cin, cout;
uint32_t pin, pout;
- uint32_t total_cin;
- uint32_t total_cout;
- uint32_t id;
+ uint32_t cin, cout;
+ uint32_t cin_wrap, cout_wrap;
+ uint32_t cin_delta, cout_delta;
uint16_t throttle_in;
uint16_t throttle_out;
+ uint8_t filter_in;
+ uint8_t filter_out;
+ uint16_t mru;
clockt opened;
clockt die;
+ uint32_t session_timeout;
+ uint32_t idle_timeout;
time_t last_packet;
+ time_t last_data;
in_addr_t dns1, dns2;
routet route[MAXROUTE];
- uint16_t radius;
- uint16_t mru;
uint16_t tbf_in;
uint16_t tbf_out;
- uint8_t l2tp_flags;
- uint8_t reserved_old_snoop;
- uint8_t walled_garden;
- uint8_t flags1;
- char random_vector[MAXTEL];
int random_vector_length;
- char user[129];
+ uint8_t random_vector[MAXTEL];
+ char user[MAXUSER];
char called[MAXTEL];
char calling[MAXTEL];
uint32_t tx_connect_speed;
uint32_t rx_connect_speed;
- uint32_t flags;
-#define SF_IPCP_ACKED 1 // Has this session seen an IPCP Ack?
-#define SF_LCP_ACKED 2 // LCP negotiated
-#define SF_CCP_ACKED 4 // CCP negotiated
+ clockt timeout;
+ uint32_t mrru;
+ uint8_t mssf;
+ epdist epdis;
+ bundleidt bundle;
in_addr_t snoop_ip;
uint16_t snoop_port;
- uint16_t sid;
- uint8_t filter_in;
- uint8_t filter_out;
- char reserved[18];
+ uint8_t walled_garden;
+ uint8_t ipv6prefixlen;
+ struct in6_addr ipv6route;
+ char reserved_3[11];
};
static uint8_t *convert_session(struct oldsession *old)
new.next = old->next;
new.far = old->far;
new.tunnel = old->tunnel;
- new.flags = old->l2tp_flags;
+ new.flags = old->flags;
+ new.ppp.phase = old->ppp.phase;
+ new.ppp.lcp = old->ppp.lcp;
+ new.ppp.ipcp = old->ppp.ipcp;
+ new.ppp.ipv6cp = old->ppp.ipv6cp;
+ new.ppp.ccp = old->ppp.ccp;
new.ip = old->ip;
new.ip_pool_index = old->ip_pool_index;
new.unique_id = old->unique_id;
new.magic = old->magic;
new.pin = old->pin;
new.pout = old->pout;
- new.cin = old->total_cin;
- new.cout = old->total_cout;
- new.cin_delta = old->cin;
- new.cout_delta = old->cout;
+ new.cin = old->cin;
+ new.cout = old->cout;
+ new.cin_wrap = old->cin_wrap;
+ new.cout_wrap = old->cout_wrap;
+ new.cin_delta = old->cin_delta;
+ new.cout_delta = old->cout_delta;
new.throttle_in = old->throttle_in;
new.throttle_out = old->throttle_out;
new.filter_in = old->filter_in;
new.mru = old->mru;
new.opened = old->opened;
new.die = old->die;
+ new.session_timeout = old->session_timeout;
+ new.idle_timeout = old->idle_timeout;
new.last_packet = old->last_packet;
+ new.last_data = old->last_data;
new.dns1 = old->dns1;
new.dns2 = old->dns2;
new.tbf_in = old->tbf_in;
new.random_vector_length = old->random_vector_length;
new.tx_connect_speed = old->tx_connect_speed;
new.rx_connect_speed = old->rx_connect_speed;
+ new.timeout = old->timeout;
+ new.mrru = old->mrru;
+ new.mssf = old->mssf;
+ new.epdis = old->epdis;
+ new.bundle = old->bundle;
new.snoop_ip = old->snoop_ip;
new.snoop_port = old->snoop_port;
new.walled_garden = old->walled_garden;
+ new.ipv6prefixlen = old->ipv6prefixlen;
+ new.ipv6route = old->ipv6route;
memcpy(new.random_vector, old->random_vector, sizeof(new.random_vector));
memcpy(new.user, old->user, sizeof(new.user));
for (i = 0; i < MAXROUTE; i++)
memcpy(&new.route[i], &old->route[i], sizeof(new.route[i]));
- if (new.opened)
- {
- new.ppp.phase = Establish;
- if (old->flags & (SF_IPCP_ACKED|SF_LCP_ACKED))
- {
- new.ppp.phase = Network;
- new.ppp.lcp = Opened;
- new.ppp.ipcp = (old->flags & SF_IPCP_ACKED) ? Opened : Starting;
- new.ppp.ccp = (old->flags & SF_CCP_ACKED) ? Opened : Stopped;
- }
-
- // no PPPv6 in old session
- new.ppp.ipv6cp = Stopped;
- }
-
return (uint8_t *) &new;
}
//
// Process a heartbeat..
//
-// v3: added interval, timeout
-// v4: added table_version
-// v5: added ipv6, re-ordered session structure
+// v6: added RADIUS class attribute, re-ordered session structure
+// v7: added tunnelt attribute at the end of struct (tunnelt size change)
static int cluster_process_heartbeat(uint8_t *data, int size, int more, uint8_t *p, in_addr_t addr)
{
heartt *h;
int i, type;
int hb_ver = more;
-#if HB_VERSION != 5
+#ifdef LAC
+#if HB_VERSION != 7
+# error "need to update cluster_process_heartbeat()"
+#endif
+#else
+#if HB_VERSION != 6
# error "need to update cluster_process_heartbeat()"
#endif
+#endif
+
- // we handle versions 3 through 5
- if (hb_ver < 3 || hb_ver > HB_VERSION) {
+ // we handle versions 5 through 7
+ if (hb_ver < 5 || hb_ver > HB_VERSION) {
LOG(0, 0, 0, "Received a heartbeat version that I don't support (%d)!\n", hb_ver);
return -1; // Ignore it??
}
return -1; // Skip it.
}
- if (hb_ver >= 4) {
- if (h->table_version > config->cluster_table_version) {
- LOG(0, 0, 0, "They've seen more state changes (%" PRIu64 " vs my %" PRIu64 ") so I'm gone!\n",
+ if (h->table_version > config->cluster_table_version) {
+ LOG(0, 0, 0, "They've seen more state changes (%" PRIu64 " vs my %" PRIu64 ") so I'm gone!\n",
h->table_version, config->cluster_table_version);
- kill(0, SIGTERM);
- exit(1);
- }
- if (h->table_version < config->cluster_table_version)
- return -1;
+ kill(0, SIGTERM);
+ exit(1);
}
+ if (h->table_version < config->cluster_table_version)
+ return -1;
+
if (basetime > h->basetime) {
LOG(0, 0, 0, "They're an older master than me so I'm gone!\n");
kill(0, SIGTERM);
s -= (p - orig_p);
// session struct changed with v5
- if (hb_ver < 5)
+ if (hb_ver < 6)
{
if (size != sizeof(struct oldsession)) {
LOG(0, 0, 0, "DANGER: Received a v%d CSESSION that didn't decompress correctly!\n", hb_ver);
break;
}
case C_SESSION:
- if (hb_ver < 5)
+ if (hb_ver < 6)
{
if (s < sizeof(struct oldsession))
goto shortpacket;
size = rle_decompress((uint8_t **) &p, s, c, sizeof(c));
s -= (p - orig_p);
- if (size != sizeof(tunnelt) ) { // Ouch! Very very bad!
+#ifdef LAC
+ if ( ((hb_ver >= HB_VERSION) && (size != sizeof(tunnelt))) ||
+ ((hb_ver < HB_VERSION) && (size > sizeof(tunnelt))) )
+#else
+ if (size != sizeof(tunnelt) )
+#endif
+ { // Ouch! Very very bad!
LOG(0, 0, 0, "DANGER: Received a CTUNNEL that didn't decompress correctly!\n");
// Now what? Should exit! No-longer up to date!
break;
return 0;
}
+ case C_PPPOE_FORWARD:
+ if (!config->cluster_iam_master)
+ {
+ LOG(0, 0, 0, "I'm not the master, but I got a C_PPPOE_FORWARD from %s?\n", fmtaddr(addr, 0));
+ return -1;
+ }
+ else
+ {
+ pppoe_process_forward(p, s, addr);
+ return 0;
+ }
+
+ case C_MPPP_FORWARD:
+ // Receive a MPPP packet from a slave.
+ if (!config->cluster_iam_master) {
+ LOG(0, 0, 0, "I'm not the master, but I got a C_MPPP_FORWARD from %s?\n", fmtaddr(addr, 0));
+ return -1;
+ }
+
+ processipout(p, s);
+ return 0;
case C_THROTTLE: { // Receive a forwarded packet from a slave.
if (!config->cluster_iam_master) {
projects / l2tpns.git / blobdiff