volatile bool running = false;
time_t now = 0;
+int contradicting_add_edge = 0;
+int contradicting_del_edge = 0;
/* Purge edges and subnets of unreachable nodes. Use carefully. */
if(FD_ISSET(c->socket, readset)) {
if(c->status.connecting) {
c->status.connecting = false;
- getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
+ getsockopt(c->socket, SOL_SOCKET, SO_ERROR, (void *)&result, &len);
if(!result)
finish_connecting(c);
send_key_changed(broadcast, myself);
keyexpires = now + keylifetime;
}
+
+ if(contradicting_del_edge && contradicting_add_edge) {
+ logger(LOG_WARNING, "Possible node with same Name as us!");
+
+ if(rand() % 3 == 0) {
+ logger(LOG_ERR, "Shutting down, check configuration of all nodes for duplicate Names!");
+ running = false;
+ break;
+ }
+
+ contradicting_add_edge = 0;
+ contradicting_del_edge = 0;
+ }
}
if(sigalrm) {
subnet = node->data;
if(subnet->expires == 1) {
send_del_subnet(broadcast, subnet);
+ if(subnet->owner->status.reachable)
+ subnet_update(subnet->owner, subnet, false);
subnet_del(subnet->owner, subnet);
} else if(subnet->expires == -1) {
- send_add_subnet(broadcast, subnet);
subnet->expires = 0;
+ } else {
+ send_add_subnet(broadcast, subnet);
+ if(subnet->owner->status.reachable)
+ subnet_update(subnet->owner, subnet, true);
}
}
}