Merge commit 'f3b6661d' into thread-merge-2.16

conf/conf.c

@@ -589,6 +589,7 @@ order_shutdown(int gr)
   init_list(&c->mpls_domains);
   init_list(&c->symbols);
   obstacle_target_init(&c->obstacles, &c->obstacles_cleared, c->pool, "Config");
+  c->cli = (struct cli_config_list) {};
   memset(c->def_tables, 0, sizeof(c->def_tables));
   c->shutdown = 1;
   c->gr_down = gr;

conf/confbase.Y

@@ -105,6 +105,7 @@ CF_DECLS
   struct adata *ad;
   const struct adata *bs;
   struct aggr_item_node *ai;
+  struct cli_config *cli;
 }
 
 %token END CLI_MARKER INVALID_TOKEN ELSECOL DDOT

doc/bird.sgml

@@ -1264,9 +1264,11 @@ protocol bgp {
 <chapt>Remote control
 <label id="remote-control">
 
+<sect>Overview
+<label id="remote-control-overview">
+
 <p>You can use the command-line client <file>birdc</file> to talk with a running
-BIRD. Communication is done using a <file/bird.ctl/ UNIX domain socket (unless
-changed with the <tt/-s/ option given to both the server and the client). The
+BIRD. Communication is done using the appropriate UNIX domain socket. The
 commands can perform simple actions such as enabling/disabling of protocols,
 telling BIRD to show various information, telling it to show routing table
 filtered by filter, or asking BIRD to reconfigure. Press <tt/?/ at any time to
@@ -1282,10 +1284,27 @@ does not support command line editing and history and has minimal dependencies.
 This is useful for running BIRD in resource constrained environments, where
 Readline library (required for regular BIRD client) is not available.
 
-<p>Many commands have the <m/name/ of the protocol instance as an argument.
-This argument can be omitted if there exists only a single instance.
+<sect>Configuration
+<label id="remote-control-configuration">
 
-<p>Here is a brief list of supported functions:
+<p>By default, BIRD opens <file/bird.ctl/ UNIX domain socket and the CLI tool
+connects to it. If changed on the command line by the <tt/-s/ option,
+BIRD or the CLI tool connects there instead.
+
+<p>It's also possible to configure additional remote control sockets in the
+configuration file by <cf/cli "name";/ and you can open how many
+sockets you wish. There are no checks whether the user configured the same
+socket multiple times and BIRD may behave weirdly if this happens. On shutdown,
+the additional sockets get removed immediately and only the main socket stays
+until the very end.
+
+<sect>Usage
+<label id="remote-control-usage">
+
+<p>Here is a brief list of supported functions.
+
+<p>Note: Many commands have the <m/name/ of the protocol instance as an argument.
+This argument can be omitted if there exists only a single instance.
 
 <descrip>
 	<tag><label id="cli-show-status">show status</tag>

nest/cli.h

@@ -53,12 +53,16 @@ struct cli_config {
 #define TLIST_ITEM n
 #define TLIST_DEFINED_BEFORE
 #define TLIST_WANT_ADD_TAIL
+#define TLIST_WANT_WALK
   TLIST_DEFAULT_NODE;
   const char *name;
+  struct config *config;
   uint uid, gid, mode;
 };
 #include "lib/tlists.h"
 
+void cli_config_listen(struct cli_config *, const char *);
+
 extern pool *cli_pool;
 extern struct cli *this_cli;		/* Used during parsing */
 

sysdep/unix/config.Y

@@ -22,6 +22,7 @@ CF_KEYWORDS(NAME, CONFIRM, UNDO, CHECK, TIMEOUT, DEBUG, LATENCY, LIMIT, WATCHDOG
 CF_KEYWORDS(PING, WAKEUP, SOCKETS, SCHEDULING, EVENTS, TIMERS, ALLOCATOR)
 CF_KEYWORDS(GRACEFUL, RESTART, FIXED)
 
+%type <cli> cli_opts
 %type <i> log_mask log_mask_list log_cat cfg_timeout debug_unix latency_debug_mask latency_debug_flag latency_debug_list
 %type <t> cfg_name
 %type <tf> timeformat_which
@@ -122,6 +123,21 @@ mrtdump_base:
    }
  ;
 
+conf: cli ;
+
+cli: CLI text cli_opts {
+  $3->name = $2;
+  cli_config_add_tail(&new_config->cli, $3);
+} ;
+
+cli_opts: ';' {
+  $$ = cfg_alloc(sizeof *$$);
+  *$$ = (typeof (*$$)) {
+    .config = new_config,
+    .mode = 0660,
+  };
+};
+
 conf: THREADS expr {
     if ($2 < 1) cf_error("Number of threads must be at least one.");
     new_config->thread_count = $2;

sysdep/unix/io.c

@@ -2576,7 +2576,7 @@ io_loop(void)
 }
 
 void
-test_old_bird(char *path)
+test_old_bird(const char *path)
 {
   int fd;
   struct sockaddr_un sa;

sysdep/unix/main.c

@@ -30,6 +30,7 @@
 #include "lib/event.h"
 #include "lib/locking.h"
 #include "lib/timer.h"
+#include "lib/tlists.h"
 #include "lib/string.h"
 #include "nest/route.h"
 #include "nest/protocol.h"
@@ -186,6 +187,8 @@ cf_read(byte *dest, uint len, int fd)
   return l;
 }
 
+static void cli_preconfig(struct config *c);
+
 void
 sysdep_preconfig(struct config *c)
 {
@@ -200,14 +203,19 @@ sysdep_preconfig(struct config *c)
   read_iproute_table(c, PATH_IPROUTE_DIR "/rt_scopes", "ips_", 255);
   read_iproute_table(c, PATH_IPROUTE_DIR "/rt_tables", "ipt_", 0xffffffff);
 #endif
+
+  cli_preconfig(c);
 }
 
+static void cli_commit(struct config *new, struct config *old);
+
 void
 sysdep_commit(struct config *new, struct config *old)
 {
   if (!new->shutdown)
     log_switch(0, &new->logfiles, new->syslog_name);
 
+  cli_commit(new, old);
   bird_thread_commit(new, old);
 }
 
@@ -400,13 +408,29 @@ cmd_reconfig_status(void)
  *	Command-Line Interface
  */
 
-static char *path_control_socket = PATH_CONTROL_SOCKET;
+static struct cli_config initial_control_socket_config = {
+  .name = PATH_CONTROL_SOCKET,
+  .mode = 0660,
+};
+#define path_control_socket initial_control_socket_config.name
+
 static struct cli_config *main_control_socket_config = NULL;
+
+#define TLIST_PREFIX cli_listener
+#define TLIST_TYPE struct cli_listener
+#define TLIST_ITEM n
+#define TLIST_WANT_ADD_TAIL
+#define TLIST_WANT_WALK
 static struct cli_listener {
+  TLIST_DEFAULT_NODE;
   sock *s;
   struct cli_config *config;
 } *main_control_socket = NULL;
 
+#include "lib/tlists.h"
+
+static TLIST_LIST(cli_listener) cli_listeners;
+
 static void
 cli_write(cli *c)
 {
@@ -535,7 +559,7 @@ cli_connect(sock *s, uint size UNUSED)
 }
 
 static struct cli_listener *
-cli_listener(struct cli_config *cf)
+cli_listen(struct cli_config *cf)
 {
   struct cli_listener *l = mb_allocz(cli_pool, sizeof *l);
   l->config = cf;
@@ -569,29 +593,78 @@ cli_listener(struct cli_config *cf)
     return NULL;
   }
 
+  cli_listener_add_tail(&cli_listeners, l);
+
   return l;
 }
 
+static void
+cli_deafen(struct cli_listener *l)
+{
+  rfree(l->s);
+  unlink(l->config->name);
+  cli_listener_rem_node(&cli_listeners, l);
+  mb_free(l);
+}
+
 static void
 cli_init_unix(uid_t use_uid, gid_t use_gid)
 {
   ASSERT_DIE(main_control_socket_config == NULL);
+  cli_init();
 
-  main_control_socket_config = mb_alloc(&root_pool, sizeof *main_control_socket_config);
-  *main_control_socket_config = (struct cli_config) {
-    .name = path_control_socket,
-    .uid = use_uid,
-    .gid = use_gid,
-    .mode = 0660,
-  };
+  main_control_socket_config = &initial_control_socket_config;
+  main_control_socket_config->uid = use_uid;
+  main_control_socket_config->gid = use_gid;
 
   ASSERT_DIE(main_control_socket == NULL);
-  cli_init();
-  main_control_socket = cli_listener(main_control_socket_config);
+  main_control_socket = cli_listen(main_control_socket_config);
   if (!main_control_socket)
     die("Won't run without control socket");
 }
 
+static void
+cli_preconfig(struct config *c)
+{
+  struct cli_config *ccf = mb_alloc(cli_pool, sizeof *ccf);
+  memcpy(ccf, main_control_socket_config, sizeof *ccf);
+  ccf->n = (struct cli_config_node) {};
+  ccf->config = c;
+  cli_config_add_tail(&c->cli, ccf);
+}
+
+static void
+cli_commit(struct config *new, struct config *old)
+{
+  if (new->shutdown)
+  {
+    /* Keep the main CLI throughout the shutdown */
+    initial_control_socket_config.config = new;
+    main_control_socket->config = &initial_control_socket_config;
+  }
+
+  WALK_TLIST(cli_config, c, &new->cli)
+  {
+    _Bool seen = 0;
+    WALK_TLIST(cli_listener, l, &cli_listeners)
+      if (l->config->config != new)
+	if (!strcmp(l->config->name, c->name))
+	{
+	  ASSERT_DIE(l->config->config == old);
+	  l->config = c;
+	  seen = 1;
+	  break;
+	}
+
+    if (!seen)
+      cli_listen(c);
+  }
+
+  WALK_TLIST_DELSAFE(cli_listener, l, &cli_listeners)
+    if (l->config->config != new)
+      cli_deafen(l);
+}
+
 
 /*
  *	PID file
@@ -670,7 +743,7 @@ void
 sysdep_shutdown_done(void)
 {
   unlink_pid_file();
-  unlink(path_control_socket);
+  cli_deafen(main_control_socket);
   log_msg(L_FATAL "Shutdown completed");
   exit(0);
 }

sysdep/unix/unix.h

@@ -130,7 +130,7 @@ int rf_fileno(struct rfile *f);
 
 extern struct rfile rf_stderr;
 
-void test_old_bird(char *path);
+void test_old_bird(const char *path);
 ip_addr resolve_hostname(const char *host, int type, const char **err_msg);
 
 /* krt.c bits */