Don't allow disconnect of admin network.

diff --git a/NEWS b/NEWS
index e10e3840f0248e5f33483bea112525329c916afd..1960bd8f909c657d377b0ea2a3ab397ed2e67ef6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,8 @@ Ctrlproxy 3.0.4 UNRELEASED
     * Add "default-network" setting.
 
   BUG FIXES
+    
+    * Don't allow disconnect of admin network. (#164)
 
     * Clearer error messages during disconnect.
 

diff --git a/lib/network.c b/lib/network.c
index 2e259c4fd481e63ae61e1905f96b57856944afb0..d96486295ef2034b1441bc197ea57fd4336dcd01 100644 (file)
--- a/lib/network.c
+++ b/lib/network.c
@@ -1295,6 +1295,7 @@ gboolean disconnect_network(struct network *s)
        if (s->connection.state == NETWORK_CONNECTION_STATE_NOT_CONNECTED) {
                return FALSE;
        }
+
        log_network(LOG_INFO, s, "Disconnecting");
        return close_server(s);
 }

diff --git a/lib/network.h b/lib/network.h
index 8fc13519a0f27c91ea0e854620401f3586491e5f..a4f2bb95a9e5d8df3213e9603a9e1d87c3d12a55 100644 (file)
--- a/lib/network.h
+++ b/lib/network.h
@@ -80,9 +80,10 @@ struct network_connection {
                        void *private_data;
                        struct virtual_network_ops {
                                char *name;
+                               gboolean not_disconnectable;
                                gboolean (*init) (struct network *);
                                gboolean (*to_server) (struct network *, struct client *c, const struct line *);
-                               gboolean (*fini) (struct network *);
+                               void (*fini) (struct network *);
                        } *ops;
                } virtual;
        } data;

diff --git a/src/admin.c b/src/admin.c
index 393ef59ebbca9eb9b490b66edf6ea20a4cf7809a..3a5b8954a7e5c57d7e8f8180fea1e186b72a7507 100644 (file)
--- a/src/admin.c
+++ b/src/admin.c
@@ -281,6 +281,10 @@ static void cmd_disconnect_network (admin_handle h, char **args, void *userdata)
 
        if (n->connection.state == NETWORK_CONNECTION_STATE_NOT_CONNECTED) {
                admin_out(h, "Already disconnected from `%s'", n->info.name);
+       } else if (n->config->type == NETWORK_VIRTUAL && 
+               n->connection.data.virtual.ops->not_disconnectable) {
+               admin_out(h, "Built-in network `%s' can't be disconnected", 
+                                 n->info.name);
        } else {
                admin_out(h, "Disconnecting from `%s'", n->info.name);
                disconnect_network(n);
@@ -794,7 +798,10 @@ static gboolean admin_to_server (struct network *n, struct client *c, const stru
 }
 
 struct virtual_network_ops admin_network = {
-       "admin", admin_net_init, admin_to_server, NULL
+       .name = "admin", 
+       .init = admin_net_init, 
+       .to_server = admin_to_server, 
+       .not_disconnectable = TRUE,
 };