If we're not in main_loop() and the service is stopped, exit immediately.

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index 475ea0c..7d8c58c 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net.c,v 1.35.4.192 2003/07/22 20:55:19 guus Exp $
+    $Id: net.c,v 1.35.4.197 2003/08/17 12:05:08 guus Exp $
 */
 
 #include "system.h"
@@ -39,8 +39,10 @@
 #include "protocol.h"
 #include "route.h"
 #include "subnet.h"
+#include "xalloc.h"
 
 bool do_purge = false;
+volatile bool running = false;
 
 time_t now = 0;
 
@@ -153,7 +155,7 @@ void terminate_connection(connection_t *c, bool report)
                c->node->connection = NULL;
 
        if(c->socket)
-               close(c->socket);
+               closesocket(c->socket);
 
        if(c->edge) {
                if(report)
@@ -206,7 +208,7 @@ static void check_dead_connections(void)
                        } else {
                                if(c->status.remove) {
                                        logger(LOG_WARNING, _("Old connection_t for %s (%s) status %04x still lingering, deleting..."),
-                                                  c->name, c->hostname, c->status);
+                                                  c->name, c->hostname, *(uint32_t *)&c->status);
                                        connection_del(c);
                                        continue;
                                }
@@ -254,7 +256,7 @@ static void check_network_activity(fd_set * f)
                                        ifdebug(CONNECTIONS) logger(LOG_DEBUG,
                                                           _("Error while connecting to %s (%s): %s"),
                                                           c->name, c->hostname, strerror(result));
-                                       close(c->socket);
+                                       closesocket(c->socket);
                                        do_outgoing_connection(c);
                                        continue;
                                }
@@ -279,7 +281,7 @@ static void check_network_activity(fd_set * f)
 /*
   this is where it all happens...
 */
-void main_loop(void)
+int main_loop(void)
 {
        fd_set fset;
        struct timeval tv;
@@ -293,7 +295,9 @@ void main_loop(void)
        last_config_check = now;
        srand(now);
 
-       for(;;) {
+       running = true;
+
+       while(running) {
                now = time(NULL);
 
                tv.tv_sec = 1 + (rand() & 7);   /* Approx. 5 seconds, randomized to prevent global synchronisation effects */
@@ -309,7 +313,7 @@ void main_loop(void)
                                           strerror(errno));
                                cp_trace();
                                dump_connections();
-                               return;
+                               return 1;
                        }
 
                        continue;
@@ -339,7 +343,8 @@ void main_loop(void)
                                ifdebug(STATUS) logger(LOG_INFO, _("Regenerating symmetric key"));
 
                                RAND_pseudo_bytes(myself->key, myself->keylength);
-                               EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key, myself->key + myself->cipher->key_len);
+                               if(myself->cipher)
+                                       EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key, myself->key + myself->cipher->key_len);
                                send_key_changed(broadcast, myself);
                                keyexpires = now + keylifetime;
                        }
@@ -377,7 +382,7 @@ void main_loop(void)
 
                        if(!read_server_config()) {
                                logger(LOG_ERR, _("Unable to reread configuration file, exitting."));
-                               exit(1);
+                               return 1;
                        }
 
                        /* Close connections to hosts that have a changed or deleted host config file */
@@ -403,8 +408,8 @@ void main_loop(void)
                        /* Try to make outgoing connections */
                        
                        try_outgoing_connections();
-                                               
-                       continue;
                }
        }
+
+       return 0;
 }