#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.
// 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");
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;
{
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.
-
- cluster_changes[i].type = type;
- cluster_changes[i].id = id;
- ++config->cluster_num_changes;
-
- if (config->cluster_num_changes > MAX_CHANGES)
- cluster_heartbeat(); // flush now
-
- return 1;
-}
-
-// The deleted session, must be before the new session
-int cluster_listinvert_session(int sidnew, int sidtodel)
-{
- int i, inew = 0;
-
for (i = 0 ; i < config->cluster_num_changes ; ++i)
{
- if ( cluster_changes[i].id == sidtodel && cluster_changes[i].type == C_CSESSION)
- return 0; // Deleted session already before the new session.
-
- if ( cluster_changes[i].id == sidnew && cluster_changes[i].type == C_CSESSION)
+ if ( cluster_changes[i].id == id && cluster_changes[i].type == type)
{
- inew = i;
+ // 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;
}
}
- for ( ; i < config->cluster_num_changes ; ++i)
- {
- if ( cluster_changes[i].id == sidtodel && cluster_changes[i].type == C_CSESSION)
- {
- // Reverse position
- cluster_changes[i].id = sidnew;
- cluster_changes[inew].id = sidtodel;
- return 1;
- }
- }
+ cluster_changes[config->cluster_num_changes].type = type;
+ cluster_changes[config->cluster_num_changes].id = id;
+ ++config->cluster_num_changes;
- return 0;
+ if (config->cluster_num_changes > MAX_CHANGES)
+ cluster_heartbeat(); // flush now
+
+ return 1;
}
// A particular session has been changed!
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;
// Process a heartbeat..
//
// 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;
+#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 5 through 6
+
+ // 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??
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.
projects / l2tpns.git / blobdiff