if(!found) {
logger(DEBUG_CONNECTIONS, LOG_INFO, "Autoconnecting to %s", n->name);
- outgoing_t *outgoing = xmalloc_and_zero(sizeof *outgoing);
+ outgoing_t *outgoing = xzalloc(sizeof *outgoing);
outgoing->name = xstrdup(n->name);
list_insert_tail(outgoing_list, outgoing);
setup_outgoing_connection(outgoing);
}
void handle_meta_connection_data(connection_t *c) {
- int result;
- socklen_t len = sizeof result;
-
- if(c->status.connecting) {
- c->status.connecting = false;
-
- getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
-
- if(!result)
- finish_connecting(c);
- else {
- logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Error while connecting to %s (%s): %s", c->name, c->hostname, sockstrerror(result));
- terminate_connection(c, false);
- return;
- }
- }
-
if (!receive_meta(c)) {
terminate_connection(c, c->status.active);
return;
}
}
+#ifndef HAVE_MINGW
static void sigterm_handler(void *data) {
logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s signal", strsignal(((signal_t *)data)->signum));
event_exit();
logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s signal", strsignal(((signal_t *)data)->signum));
retry();
}
+#endif
int reload_configuration(void) {
- char *fname;
+ char *fname = NULL;
/* Reread our own configuration file */
free(fname);
}
- last_config_check = time(NULL);
+ last_config_check = now.tv_sec;
return 0;
}