X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet.c;h=8ee782145cbd9b28a5d12734b50022db2dffd7ce;hb=08aabbf9317806bc50a9a6693ca866c8936ce26b;hp=9d4a0a2bf6e7bd889fff7b8d554bc9141feb7c56;hpb=1065879c8c6e8cdf8d3755024241f31eaabd4138;p=meshlink

diff --git a/src/net.c b/src/net.c
index 9d4a0a2b..8ee78214 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 <guus@tinc-vpn.org>
+                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -203,7 +203,7 @@ 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;
@@ -233,33 +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;
-
+static void sighup_handler(int signal, short events, void *data) {
 	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;
-	}
+	reload_configuration();
 }
 
-static void sighup_handler(int signal, short events, void *data) {
+int reload_configuration(void) {
 	connection_t *c;
 	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 */
 
@@ -269,7 +253,7 @@ 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 */
@@ -297,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;
 
@@ -325,10 +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 sigalrm_event;
 
 	cp();
 
@@ -336,14 +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(&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));
@@ -351,10 +329,8 @@ int main_loop(void) {
 	}
 
 	signal_del(&sighup_event);
-	signal_del(&sigint_event);
 	signal_del(&sigterm_event);
 	signal_del(&sigquit_event);
-	signal_del(&sigalrm_event);
 	event_del(&timeout_event);
 
 	return 0;