tinc-gui: Reformat codebase according to PEP8

[tinc] / src / control.c

diff --git a/src/control.c b/src/control.c
index c166943..98eae80 100644 (file)
--- a/src/control.c
+++ b/src/control.c
@@ -1,6 +1,6 @@
 /*
     control.c -- Control socket handling.
-    Copyright (C) 2012 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2013 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
@@ -25,6 +25,7 @@
 #include "graph.h"
 #include "logger.h"
 #include "meta.h"
+#include "names.h"
 #include "net.h"
 #include "netutl.h"
 #include "protocol.h"
@@ -33,7 +34,6 @@
 #include "xalloc.h"
 
 char controlcookie[65];
-extern char *pidfilename;
 
 static bool control_return(connection_t *c, int type, int error) {
        return send_request(c, "%d %d %d", CONTROL, type, error);
@@ -58,7 +58,7 @@ bool control_h(connection_t *c, const char *request) {
 
        switch (type) {
                case REQ_STOP:
-                       event_loopexit(NULL);
+                       event_exit();
                        return control_ok(c, REQ_STOP);
 
                case REQ_DUMP_NODES:
@@ -106,7 +106,7 @@ bool control_h(connection_t *c, const char *request) {
                        for list_each(connection_t, other, connection_list) {
                                if(strcmp(other->name, name))
                                        continue;
-                               terminate_connection(other, other->status.active);
+                               terminate_connection(other, other->edge);
                                found = true;
                        }
 
@@ -137,17 +137,16 @@ bool init_control(void) {
        randomize(controlcookie, sizeof controlcookie / 2);
        bin2hex(controlcookie, controlcookie, sizeof controlcookie / 2);
 
+       mode_t mask = umask(0);
+       umask(mask | 077);
        FILE *f = fopen(pidfilename, "w");
+       umask(mask);
+
        if(!f) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Cannot write control socket cookie file %s: %s", pidfilename, strerror(errno));
                return false;
        }
 
-#ifdef HAVE_FCHMOD
-       fchmod(fileno(f), 0600);
-#else
-       chmod(pidfilename, 0600);
-#endif
        // Get the address and port of the first listening socket
 
        char *localhost = NULL;
@@ -156,8 +155,8 @@ bool init_control(void) {
 
        // Make sure we have a valid address, and map 0.0.0.0 and :: to 127.0.0.1 and ::1.
 
-       if(getsockname(listen_socket[0].tcp, (struct sockaddr *)&sa, &len)) {
-               xasprintf(&localhost, "127.0.0.1 port %d", myport);
+       if(getsockname(listen_socket[0].tcp.fd, (struct sockaddr *)&sa, &len)) {
+               xasprintf(&localhost, "127.0.0.1 port %s", myport);
        } else {
                if(sa.sa.sa_family == AF_INET) {
                        if(sa.in.sin_addr.s_addr == 0)
@@ -176,9 +175,50 @@ bool init_control(void) {
        free(localhost);
        fclose(f);
 
+#ifndef HAVE_MINGW
+       int unix_fd = socket(AF_UNIX, SOCK_STREAM, 0);
+       if(unix_fd < 0) {
+               logger(DEBUG_ALWAYS, LOG_ERR, "Could not create UNIX socket: %s", sockstrerror(sockerrno));
+               return false;
+       }
+
+       struct sockaddr_un sa_un;
+       sa_un.sun_family = AF_UNIX;
+       strncpy(sa_un.sun_path, unixsocketname, sizeof sa_un.sun_path);
+
+       if(connect(unix_fd, (struct sockaddr *)&sa_un, sizeof sa_un) >= 0) {
+               logger(DEBUG_ALWAYS, LOG_ERR, "UNIX socket %s is still in use!", unixsocketname);
+               return false;
+       }
+
+       unlink(unixsocketname);
+
+       umask(mask | 077);
+       int result = bind(unix_fd, (struct sockaddr *)&sa_un, sizeof sa_un);
+       umask(mask);
+
+       if(result < 0) {
+               logger(DEBUG_ALWAYS, LOG_ERR, "Could not bind UNIX socket to %s: %s", unixsocketname, sockstrerror(sockerrno));
+               return false;
+       }
+
+       if(listen(unix_fd, 3) < 0) {
+               logger(DEBUG_ALWAYS, LOG_ERR, "Could not listen on UNIX socket %s: %s", unixsocketname, sockstrerror(sockerrno));
+               return false;
+       }
+
+       io_add(&unix_socket, handle_new_unix_connection, &unix_socket, unix_fd, IO_READ);
+#endif
+
        return true;
 }
 
 void exit_control(void) {
+#ifndef HAVE_MINGW
+       unlink(unixsocketname);
+       io_del(&unix_socket);
+       close(unix_socket.fd);
+#endif
+
        unlink(pidfilename);
 }