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)
+ {
+ inew = 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;
+ }
+ }
+
+ return 0;
+}
// A particular session has been changed!
int cluster_send_session(int sid)
// 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;