else {
ifdebug(CONNECTIONS) logger(LOG_DEBUG,
"Error while connecting to %s (%s): %s",
- c->name, c->hostname, strerror(result));
+ c->name, c->hostname, sockstrerror(result));
closesocket(c->socket);
do_outgoing_connection(c);
continue;
#endif
if(r < 0) {
- if(errno != EINTR && errno != EAGAIN) {
- logger(LOG_ERR, "Error while waiting for input: %s",
- strerror(errno));
+ if(!sockwouldblock(sockerrno)) {
+ logger(LOG_ERR, "Error while waiting for input: %s", sockstrerror(sockerrno));
dump_connections();
return 1;
}
-
- continue;
}
- check_network_activity(&readset, &writeset);
+ if(r > 0)
+ check_network_activity(&readset, &writeset);
if(do_purge) {
purge();
}
if(sigalrm) {
+ avl_node_t *node;
logger(LOG_INFO, "Flushing event queue");
expire_events();
+ for(node = connection_tree->head; node; node = node->next) {
+ connection_t *c = node->data;
+ send_ping(c);
+ }
sigalrm = false;
}