X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.c;h=cb6ed4996638b35899a5f51b0cff48a4f9d17c51;hb=4bdf0e80ee4cd0d40eb6522dab05df9346a5b3d0;hp=d78770e12c7da38c38339eba8d88d92a714bed96;hpb=ce976717ea9756aa985699547fdbf132b694748d;p=tinc diff --git a/src/net.c b/src/net.c index d78770e1..cb6ed499 100644 --- a/src/net.c +++ b/src/net.c @@ -1,7 +1,7 @@ /* net.c -- most of the network code Copyright (C) 1998-2005 Ivo Timmermans, - 2000-2006 Guus Sliepen + 2000-2009 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -41,7 +41,7 @@ /* Purge edges and subnets of unreachable nodes. Use carefully. */ -static void purge(void) { +void purge(void) { splay_node_t *nnode, *nnext, *enode, *enext, *snode, *snext; node_t *n; edge_t *e; @@ -121,8 +121,6 @@ void terminate_connection(connection_t *c, bool report) { if(c->socket) closesocket(c->socket); - event_del(&c->ev); - if(c->edge) { if(report && !tunnelserver) send_del_edge(broadcast, c->edge); @@ -146,20 +144,12 @@ void terminate_connection(connection_t *c, bool report) { } } - free(c->outbuf); - c->outbuf = NULL; - c->outbuflen = 0; - c->outbufsize = 0; - c->outbufstart = 0; - /* Check if this was our outgoing connection */ - if(c->outgoing) { + if(c->outgoing) retry_outgoing(c->outgoing); - c->outgoing = NULL; - } else { - connection_del(c); - } + + connection_del(c); } /* @@ -186,20 +176,20 @@ static void timeout_handler(int fd, short events, void *event) { if(c->status.pinged) { ifdebug(CONNECTIONS) logger(LOG_INFO, _("%s (%s) didn't respond to PING in %ld seconds"), c->name, c->hostname, now - c->last_ping_time); - c->status.timeout = true; terminate_connection(c, true); continue; } else if(c->last_ping_time + pinginterval < now) { send_ping(c); } } else { - ifdebug(CONNECTIONS) logger(LOG_WARNING, _("Timeout from %s (%s) during authentication"), - c->name, c->hostname); if(c->status.connecting) { + ifdebug(CONNECTIONS) + logger(LOG_WARNING, _("Timeout while connecting to %s (%s)"), c->name, c->hostname); c->status.connecting = false; closesocket(c->socket); do_outgoing_connection(c); } else { + ifdebug(CONNECTIONS) logger(LOG_WARNING, _("Timeout from %s (%s) during authentication"), c->name, c->hostname); terminate_connection(c, false); continue; } @@ -213,9 +203,11 @@ static void timeout_handler(int fd, short events, void *event) { void handle_meta_connection_data(int fd, short events, void *data) { connection_t *c = data; int result; - socklen_t len = sizeof(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) @@ -224,7 +216,6 @@ void handle_meta_connection_data(int fd, short events, void *data) { ifdebug(CONNECTIONS) logger(LOG_DEBUG, _("Error while connecting to %s (%s): %s"), c->name, c->hostname, strerror(result)); - c->status.connecting = false; closesocket(c->socket); do_outgoing_connection(c); return; @@ -242,51 +233,17 @@ static void sigterm_handler(int signal, short events, void *data) { event_loopexit(NULL); } -static void sigint_handler(int signal, short events, void *data) { - static int saved_debug_level = -1; - - logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal)); - - if(saved_debug_level != -1) { - logger(LOG_NOTICE, _("Reverting to old debug level (%d)"), - saved_debug_level); - debug_level = saved_debug_level; - saved_debug_level = -1; - } else { - logger(LOG_NOTICE, - _("Temporarily setting debug level to 5. Kill me with SIGINT again to go back to level %d."), - debug_level); - saved_debug_level = debug_level; - debug_level = 5; - } -} - -static void sigusr1_handler(int signal, short events, void *data) { - logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal)); - dump_connections(); -} - -static void sigusr2_handler(int signal, short events, void *data) { - logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal)); - dump_device_stats(); - dump_nodes(); - dump_edges(); - dump_subnets(); -} - -static void sigwinch_handler(int signal, short events, void *data) { +static void sighup_handler(int signal, short events, void *data) { logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal)); - purge(); + reload_configuration(); } -static void sighup_handler(int signal, short events, void *data) { +int reload_configuration(void) { connection_t *c; - splay_node_t *node; + splay_node_t *node, *next; char *fname; struct stat s; static time_t last_config_check = 0; - - logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal)); /* Reread our own configuration file */ @@ -296,13 +253,14 @@ static void sighup_handler(int signal, short events, void *data) { if(!read_server_config()) { logger(LOG_ERR, _("Unable to reread configuration file, exitting.")); event_loopexit(NULL); - return; + return EINVAL; } /* Close connections to hosts that have a changed or deleted host config file */ - for(node = connection_tree->head; node; node = node->next) { + for(node = connection_tree->head; node; node = next) { c = node->data; + next = node->next; if(c->outgoing) { free(c->outgoing->name); @@ -312,7 +270,7 @@ static void sighup_handler(int signal, short events, void *data) { c->outgoing = NULL; } - asprintf(&fname, "%s/hosts/%s", confbase, c->name); + xasprintf(&fname, "%s/hosts/%s", confbase, c->name); if(stat(fname, &s) || s.st_mtime > last_config_check) terminate_connection(c, c->status.active); free(fname); @@ -323,11 +281,11 @@ static void sighup_handler(int signal, short events, void *data) { /* Try to make outgoing connections */ try_outgoing_connections(); -} -static void sigalrm_handler(int signal, short events, void *data) { - logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal)); + return 0; +} +void retry(void) { connection_t *c; splay_node_t *node; @@ -351,13 +309,8 @@ static void sigalrm_handler(int signal, short events, void *data) { int main_loop(void) { struct event timeout_event; struct event sighup_event; - struct event sigint_event; struct event sigterm_event; struct event sigquit_event; - struct event sigusr1_event; - struct event sigusr2_event; - struct event sigwinch_event; - struct event sigalrm_event; cp(); @@ -365,20 +318,10 @@ int main_loop(void) { event_add(&timeout_event, &(struct timeval){pingtimeout, 0}); signal_set(&sighup_event, SIGHUP, sighup_handler, NULL); signal_add(&sighup_event, NULL); - signal_set(&sigint_event, SIGINT, sigint_handler, NULL); - signal_add(&sigint_event, NULL); signal_set(&sigterm_event, SIGTERM, sigterm_handler, NULL); signal_add(&sigterm_event, NULL); signal_set(&sigquit_event, SIGQUIT, sigterm_handler, NULL); signal_add(&sigquit_event, NULL); - signal_set(&sigusr1_event, SIGUSR1, sigusr1_handler, NULL); - signal_add(&sigusr1_event, NULL); - signal_set(&sigusr2_event, SIGUSR2, sigusr2_handler, NULL); - signal_add(&sigusr2_event, NULL); - signal_set(&sigwinch_event, SIGWINCH, sigwinch_handler, NULL); - signal_add(&sigwinch_event, NULL); - signal_set(&sigalrm_event, SIGALRM, sigalrm_handler, NULL); - signal_add(&sigalrm_event, NULL); if(event_loop(0) < 0) { logger(LOG_ERR, _("Error while waiting for input: %s"), strerror(errno)); @@ -386,13 +329,8 @@ int main_loop(void) { } signal_del(&sighup_event); - signal_del(&sigint_event); signal_del(&sigterm_event); signal_del(&sigquit_event); - signal_del(&sigusr1_event); - signal_del(&sigusr2_event); - signal_del(&sigwinch_event); - signal_del(&sigalrm_event); event_del(&timeout_event); return 0;