tinc-gui: Reformat codebase according to PEP8

[tinc] / src / control.c

diff --git a/src/control.c b/src/control.c
index 1f56213..98eae80 100644 (file)
--- a/src/control.c
+++ b/src/control.c
@@ -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;
                        }
 
@@ -178,15 +178,15 @@ bool init_control(void) {
 #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(errno));
+               logger(DEBUG_ALWAYS, LOG_ERR, "Could not create UNIX socket: %s", sockstrerror(sockerrno));
                return false;
        }
 
-       struct sockaddr_un sun;
-       sun.sun_family = AF_UNIX;
-       strncpy(sun.sun_path, unixsocketname, sizeof sun.sun_path);
+       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 *)&sun, sizeof sun) >= 0) {
+       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;
        }
@@ -194,16 +194,16 @@ bool init_control(void) {
        unlink(unixsocketname);
 
        umask(mask | 077);
-       int result = bind(unix_fd, (struct sockaddr *)&sun, sizeof sun);
+       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(errno));
+               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(errno));
+               logger(DEBUG_ALWAYS, LOG_ERR, "Could not listen on UNIX socket %s: %s", unixsocketname, sockstrerror(sockerrno));
                return false;
        }
 
@@ -215,6 +215,7 @@ bool init_control(void) {
 
 void exit_control(void) {
 #ifndef HAVE_MINGW
+       unlink(unixsocketname);
        io_del(&unix_socket);
        close(unix_socket.fd);
 #endif