Remove support for Subnets.

[meshlink] / src / control.c

diff --git a/src/control.c b/src/control.c
index 1f562134d4f7517d8e2c8a1dd71a3a1817758844..0a8ca9b9f8540ff21a69cc73c053bb4bc342c871 100644 (file)
--- a/src/control.c
+++ b/src/control.c
@@ -67,9 +67,6 @@ bool control_h(connection_t *c, const char *request) {
                case REQ_DUMP_EDGES:
                        return dump_edges(c);
 
-               case REQ_DUMP_SUBNETS:
-                       return dump_subnets(c);
-
                case REQ_DUMP_CONNECTIONS:
                        return dump_connections(c);
 
@@ -182,11 +179,11 @@ bool init_control(void) {
                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,7 +191,7 @@ 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) {
@@ -215,6 +212,7 @@ bool init_control(void) {
 
 void exit_control(void) {
 #ifndef HAVE_MINGW
+       unlink(unixsocketname);
        io_del(&unix_socket);
        close(unix_socket.fd);
 #endif