Changeset 8ad126b7390d75e24ecc859efb01570b01bbcdc1

Timestamp:

10/02/09 00:20:36 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1254442836 +0000

git-parent:

[cec1cb615495ea336dfb3d405ee59926b654fa1f]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1254442836 +0000

Message:

This is pretty intrusive.

Here we refactor the console initalization in noit_conf_checks to have
the reusable parts pulled into the noit_conf directly so that stratcon
can make use of them. noit_conf_checks is retooled to extend that and
override the 'ls' command to have it's old form and function.

stratcon_jlog_streamer extends the noit_conf console syntax to allow
adding and removing of noits within the 'configure terminal' mode.

# conf t
# noit 10.1.2.3
# noit 10.1.5.5:12345
# no noit 10.1.2.3
# no noit 10.1.5.5:12345

This should not change the operation of noitd's console in any way;
however, the changes were quite substantial, so we should keep an eye
out for collateral breakage.

refs #195

Files:

• src/noit_conf.c (modified) (3 diffs)
• src/noit_conf.h (modified) (1 diff)
• src/noit_conf_checks.c (modified) (9 diffs)
• src/noit_conf_checks.h (modified) (1 diff)
• src/noitd.c (modified) (2 diffs)
• src/stratcon_iep.h (modified) (2 diffs)
• src/stratcon_jlog_streamer.c (modified) (8 diffs)
• src/stratcond.c (modified) (1 diff)

src/noit_conf.c

@@ -53 +53 @@
-static noit_hash_table _tmp_config = NOIT_HASH_EMPTY;
-static xmlDocPtr master_config = NULL;
+static char *root_node_name = NULL;
-static char master_config_file[PATH_MAX] = "";
-static xmlXPathContextPtr xpath_ctxt = NULL;
@@ -174 +175 @@
-int noit_conf_load(const char *path) {
-  xmlDocPtr new_config;
+  xmlNodePtr root;
-  new_config = xmlParseFile(path);
-  if(new_config) {
+    root = xmlDocGetRootElement(new_config);
+    if(root_node_name) free(root_node_name);
+    root_node_name = strdup((char *)root->name);
-    if(master_config) xmlFreeDoc(master_config);
-    if(xpath_ctxt) xmlXPathFreeContext(xpath_ctxt);
@@ -784 +789 @@
-  if(log_configs) free(log_configs);
-}
+
+static void
+conf_t_userdata_free(void *data) {
+  noit_conf_t_userdata_t *info = data;
+  if(info) {
+    if(info->path) free(info->path);
+    free(info);
+  }
+}
+
+static int
+noit_console_state_conf_terminal(noit_console_closure_t ncct,
+                                 int argc, char **argv,
+                                 noit_console_state_t *state, void *closure) {
+  noit_conf_t_userdata_t *info;
+  if(argc) {
+    nc_printf(ncct, "extra arguments not expected.\n");
+    return -1;
+  }
+  info = calloc(1, sizeof(*info));
+  info->path = strdup("/");
+  noit_console_userdata_set(ncct, NOIT_CONF_T_USERDATA, info,
+                            conf_t_userdata_free);
+  noit_console_state_push_state(ncct, state);
+  noit_console_state_init(ncct);
+  return 0;
+}
+static int
+noit_console_config_section(noit_console_closure_t ncct,
+                            int argc, char **argv,
+                            noit_console_state_t *state, void *closure) {
+  const char *err = "internal error";
+  char *path, xpath[1024];
+  noit_conf_t_userdata_t *info;
+  xmlXPathObjectPtr pobj = NULL;
+  xmlXPathContextPtr xpath_ctxt = NULL;
+  xmlNodePtr node = NULL, newnode;
+  vpsized_int delete = (vpsized_int)closure;
+
+  noit_conf_xml_xpath(NULL, &xpath_ctxt);
+  if(argc != 1) {
+    nc_printf(ncct, "requires one argument\n");
+    return -1;
+  }
+  if(strchr(argv[0], '/')) {
+    nc_printf(ncct, "invalid section name\n");
+    return -1;
+  }
+  if(!strcmp(argv[0], "check") ||
+     !strcmp(argv[0], "noit") ||
+     !strcmp(argv[0], "filterset") ||
+     !strcmp(argv[0], "config")) {
+    nc_printf(ncct, "%s is reserved.\n", argv[0]);
+    return -1;
+  }
+  info = noit_console_userdata_get(ncct, NOIT_CONF_T_USERDATA);
+  if(!strcmp(info->path, "/")) {
+    nc_printf(ncct, "manipulation of toplevel section disallowed\n");
+    return -1;
+  }
+
+  if(delete) {
+    /* We cannot delete if we have checks */
+    snprintf(xpath, sizeof(xpath), "/%s%s/%s//check", root_node_name,
+             info->path, argv[0]);
+    pobj = xmlXPathEval((xmlChar *)xpath, xpath_ctxt);
+    if(!pobj || pobj->type != XPATH_NODESET ||
+       !xmlXPathNodeSetIsEmpty(pobj->nodesetval)) {
+      err = "cannot delete section, has checks";
+      goto bad;
+    }
+    if(pobj) xmlXPathFreeObject(pobj);
+  }
+
+  snprintf(xpath, sizeof(xpath), "/%s%s/%s", root_node_name,
+           info->path, argv[0]);
+  pobj = xmlXPathEval((xmlChar *)xpath, xpath_ctxt);
+  if(!pobj || pobj->type != XPATH_NODESET) {
+    err = "internal error: cannot detect section";
+    goto bad;
+  }
+  if(!delete && !xmlXPathNodeSetIsEmpty(pobj->nodesetval)) {
+    if(xmlXPathNodeSetGetLength(pobj->nodesetval) == 1) {
+      node = xmlXPathNodeSetItem(pobj->nodesetval, 0);
+      if(info->path) free(info->path);
+      info->path = strdup((char *)xmlGetNodePath(node) +
+                          1 + strlen(root_node_name));
+      goto cdout;
+    }
+    err = "cannot create section";
+    goto bad;
+  }
+  if(delete && xmlXPathNodeSetIsEmpty(pobj->nodesetval)) {
+    err = "no such section";
+    goto bad;
+  }
+  if(delete) {
+    node = (noit_conf_section_t)xmlXPathNodeSetItem(pobj->nodesetval, 0);
+    xmlUnlinkNode(node);
+    noit_conf_mark_changed();
+    return 0;
+  }
+  if(pobj) xmlXPathFreeObject(pobj);
+
+  path = strcmp(info->path, "/") ? info->path : "";
+  snprintf(xpath, sizeof(xpath), "/%s%s", root_node_name, path);
+  pobj = xmlXPathEval((xmlChar *)xpath, xpath_ctxt);
+  if(!pobj || pobj->type != XPATH_NODESET ||
+     xmlXPathNodeSetGetLength(pobj->nodesetval) != 1) {
+    err = "path invalid?";
+    goto bad;
+  }
+  node = (noit_conf_section_t)xmlXPathNodeSetItem(pobj->nodesetval, 0);
+  if((newnode = xmlNewChild(node, NULL, (xmlChar *)argv[0], NULL)) != NULL) {
+    noit_conf_mark_changed();
+    if(info->path) free(info->path);
+    info->path = strdup((char *)xmlGetNodePath(newnode) + 1 +
+                        strlen(root_node_name));
+  }
+  else {
+    err = "failed to create section";
+    goto bad;
+  }
+ cdout:
+  if(pobj) xmlXPathFreeObject(pobj);
+  return 0;
+ bad:
+  if(pobj) xmlXPathFreeObject(pobj);
+  nc_printf(ncct, "%s\n", err);
+  return -1;
+}
+
+int
+noit_console_generic_show(noit_console_closure_t ncct,
+                          int argc, char **argv,
+                          noit_console_state_t *state, void *closure) {
+  int i, cnt, titled = 0, cliplen = 0;
+  const char *path = "", *basepath = NULL;
+  char xpath[1024];
+  noit_conf_t_userdata_t *info = NULL;
+  xmlXPathObjectPtr pobj = NULL;
+  xmlXPathContextPtr xpath_ctxt = NULL, current_ctxt;
+  xmlDocPtr master_config = NULL;
+  xmlNodePtr node = NULL;
+
+  noit_conf_xml_xpath(&master_config, &xpath_ctxt);
+  if(argc > 1) {
+    nc_printf(ncct, "too many arguments\n");
+    return -1;
+  }
+
+  info = noit_console_userdata_get(ncct, NOIT_CONF_T_USERDATA);
+  if(info) path = basepath = info->path;
+  if(!info && argc == 0) {
+    nc_printf(ncct, "argument required when not in configuration mode\n");
+    return -1;
+  }
+
+  if(argc == 1) path = argv[0];
+  if(!basepath) basepath = path;
+
+  /* { / } is a special case */
+  if(!strcmp(basepath, "/")) basepath = "";
+  if(!strcmp(path, "/")) path = "";
+
+  if(!master_config) {
+    nc_printf(ncct, "no config\n");
+    return -1;
+  }
+
+  /* { / } is the only path that will end with a /
+   * in XPath { / / * } means something _entirely different than { / * }
+   * Ever notice how it is hard to describe xpath in C comments?
+   */
+  /* We don't want to show the root node */
+  cliplen = strlen(root_node_name) + 2; /* /name/ */
+
+  /* If we are in configuration mode
+   * and we are without an argument or the argument is absolute,
+   * clip the current path off */
+  if(info && (argc == 0 || path[0] != '/')) cliplen += strlen(basepath);
+  if(!path[0] || path[0] == '/') /* base only, or absolute path requested */
+    snprintf(xpath, sizeof(xpath), "/%s%s/@*", root_node_name, path);
+  else
+    snprintf(xpath, sizeof(xpath), "/%s%s/%s/@*", root_node_name,
+             basepath, path);
+
+  current_ctxt = xpath_ctxt;
+  pobj = xmlXPathEval((xmlChar *)xpath, current_ctxt);
+  if(!pobj || pobj->type != XPATH_NODESET) {
+    nc_printf(ncct, "no such object\n");
+    goto bad;
+  }
+  cnt = xmlXPathNodeSetGetLength(pobj->nodesetval);
+  titled = 0;
+  for(i=0; i<cnt; i++) {
+    node = (noit_conf_section_t)xmlXPathNodeSetItem(pobj->nodesetval, i);
+    if(node->children && node->children == xmlGetLastChild(node) &&
+      xmlNodeIsText(node->children)) {
+      if(!titled++) nc_printf(ncct, "== Section Settings ==\n");
+      nc_printf(ncct, "%s: %s\n", xmlGetNodePath(node) + cliplen,
+                xmlXPathCastNodeToString(node->children));
+    }
+  }
+  xmlXPathFreeObject(pobj);
+
+  /* _shorten string_ turning last { / @ * } to { / * } */
+  if(!path[0] || path[0] == '/') /* base only, or absolute path requested */
+    snprintf(xpath, sizeof(xpath), "/%s%s/*", root_node_name, path);
+  else
+    snprintf(xpath, sizeof(xpath), "/%s%s/%s/*",
+             root_node_name, basepath, path);
+  pobj = xmlXPathEval((xmlChar *)xpath, current_ctxt);
+  if(!pobj || pobj->type != XPATH_NODESET) {
+    nc_printf(ncct, "no such object\n");
+    goto bad;
+  }
+  cnt = xmlXPathNodeSetGetLength(pobj->nodesetval);
+  titled = 0;
+  for(i=0; i<cnt; i++) {
+    node = (noit_conf_section_t)xmlXPathNodeSetItem(pobj->nodesetval, i);
+    if(!(node->children && node->children == xmlGetLastChild(node) &&
+         xmlNodeIsText(node->children))) {
+      if(!titled++) nc_printf(ncct, "== Subsections ==\n");
+      nc_printf(ncct, "%s\n", xmlGetNodePath(node) + cliplen);
+    }
+  }
+  xmlXPathFreeObject(pobj);
+  return 0;
+ bad:
+  if(pobj) xmlXPathFreeObject(pobj);
+  return -1;
+}
+int
+noit_console_config_cd(noit_console_closure_t ncct,
+                       int argc, char **argv,
+                       noit_console_state_t *state, void *closure) {
+  const char *err = "internal error";
+  char *path, xpath[1024];
+  noit_conf_t_userdata_t *info;
+  xmlXPathObjectPtr pobj = NULL;
+  xmlXPathContextPtr xpath_ctxt = NULL, current_ctxt;
+  xmlNodePtr node = NULL;
+  char *dest;
+
+  noit_conf_xml_xpath(NULL, &xpath_ctxt);
+  if(argc != 1 && !closure) {
+    nc_printf(ncct, "requires one argument\n");
+    return -1;
+  }
+  dest = argc ? argv[0] : (char *)closure;
+  info = noit_console_userdata_get(ncct, NOIT_CONF_T_USERDATA);
+  if(dest[0] == '/')
+    snprintf(xpath, sizeof(xpath), "/%s%s", root_node_name, dest);
+  else {
+    snprintf(xpath, sizeof(xpath), "/%s%s/%s", root_node_name,
+             info->path, dest);
+  }
+  if(xpath[strlen(xpath)-1] == '/') xpath[strlen(xpath)-1] = '\0';
+
+  current_ctxt = xpath_ctxt;
+  pobj = xmlXPathEval((xmlChar *)xpath, current_ctxt);
+  if(!pobj || pobj->type != XPATH_NODESET ||
+     xmlXPathNodeSetIsEmpty(pobj->nodesetval)) {
+    err = "no such section";
+    goto bad;
+  }
+  if(xmlXPathNodeSetGetLength(pobj->nodesetval) > 1) {
+    err = "ambiguous section";
+    goto bad;
+  }
+
+  node = (noit_conf_section_t)xmlXPathNodeSetItem(pobj->nodesetval, 0);
+  if(!strcmp((char *)node->name, "check") ||
+     !strcmp((char *)node->name, "noit") ||
+     !strcmp((char *)node->name, "filterset") ||
+     !strcmp((char *)node->name, "config")) {
+    err = "reserved word";
+    goto bad;
+  }
+  path = (char *)xmlGetNodePath(node);
+  if(strlen(path) < strlen(root_node_name) + 1 ||
+     strncmp(path + 1, root_node_name, strlen(root_node_name)) ||
+     (path[strlen(root_node_name) + 1] != '/' &&
+      path[strlen(root_node_name) + 1] != '\0')) {
+    err = "new path outside out tree";
+    goto bad;
+  }
+  free(info->path);
+  if(!strcmp(path + 1, root_node_name))
+    info->path = strdup("/");
+  else
+    info->path = strdup((char *)xmlGetNodePath(node) + 1 +
+                        strlen(root_node_name));
+  if(pobj) xmlXPathFreeObject(pobj);
+  if(closure) noit_console_state_pop(ncct, argc, argv, NULL, NULL);
+  return 0;
+ bad:
+  if(pobj) xmlXPathFreeObject(pobj);
+  nc_printf(ncct, "%s [%s]\n", err, xpath);
+  return -1;
+}
+
+char *
+conf_t_prompt(EditLine *el) {
+  noit_console_closure_t ncct;
+  noit_conf_t_userdata_t *info;
+  static char *tl = "noit(conf)# ";
+  static char *pfmt = "noit(conf:%s%s)# ";
+  int path_len, max_len;
+
+  el_get(el, EL_USERDATA, (void *)&ncct);
+  if(!ncct) return tl;
+  info = noit_console_userdata_get(ncct, NOIT_CONF_T_USERDATA);
+  if(!info) return tl;
+
+  path_len = strlen(info->path);
+  max_len = sizeof(info->prompt) - (strlen(pfmt) - 4 /* %s%s */) - 1 /* \0 */;
+  if(path_len > max_len)
+    snprintf(info->prompt, sizeof(info->prompt),
+             pfmt, "...", info->path + path_len - max_len + 3 /* ... */);
+  else
+    snprintf(info->prompt, sizeof(info->prompt), pfmt, "", info->path);
+  return info->prompt;
+}
+
+#define NEW_STATE(a) (a) = noit_console_state_alloc()
+#define ADD_CMD(a,cmd,func,ac,ss,c) \
+  noit_console_state_add_cmd((a), \
+    NCSCMD(cmd, func, ac, ss, c))
+#define DELEGATE_CMD(a,cmd,ac,ss) \
+  noit_console_state_add_cmd((a), \
+    NCSCMD(cmd, noit_console_state_delegate, ac, ss, NULL))
+
+void noit_console_conf_init() {
+  noit_console_state_t *tl, *_conf_state, *_conf_t_state,
+                       *_write_state, *_unset_state;
+
+  tl = noit_console_state_initial();
+
+  /* write <terimal|memory|file> */
+  NEW_STATE(_write_state);
+  ADD_CMD(_write_state, "terminal", noit_conf_write_terminal, NULL, NULL, NULL);
+  ADD_CMD(_write_state, "file", noit_conf_write_file_console, NULL, NULL, NULL);
+  /* write memory?  It's to a file, but I like router syntax */
+  ADD_CMD(_write_state, "memory", noit_conf_write_file_console, NULL, NULL, NULL);
+
+  NEW_STATE(_unset_state);
+  ADD_CMD(_unset_state, "section",
+          noit_console_config_section, NULL, NULL, (void *)1);
+
+  NEW_STATE(_conf_t_state); 
+  _conf_t_state->console_prompt_function = conf_t_prompt;
+  noit_console_state_add_cmd(_conf_t_state, &console_command_exit);
+
+  ADD_CMD(_conf_t_state, "ls", noit_console_generic_show, NULL, NULL, NULL);
+  ADD_CMD(_conf_t_state, "cd", noit_console_config_cd, NULL, NULL, NULL);
+  ADD_CMD(_conf_t_state, "section",
+          noit_console_config_section, NULL, NULL, (void *)0);
+
+  DELEGATE_CMD(_conf_t_state, "write",
+               noit_console_opt_delegate, _write_state);
+  DELEGATE_CMD(_conf_t_state, "no", noit_console_opt_delegate, _unset_state);
+
+  NEW_STATE(_conf_state);
+  ADD_CMD(_conf_state, "terminal",
+          noit_console_state_conf_terminal, NULL, _conf_t_state, NULL);
+
+  ADD_CMD(tl, "configure",
+          noit_console_state_delegate, noit_console_opt_delegate,
+          _conf_state, NULL);
+  ADD_CMD(tl, "write",
+          noit_console_state_delegate, noit_console_opt_delegate,
+          _write_state, NULL);
+}
+

src/noit_conf.h

@@ -66 +66 @@
-API_EXPORT(int) noit_conf_save(const char *path);
-API_EXPORT(char *) noit_conf_config_filename();
+
+API_EXPORT(void) noit_console_conf_init();
-
-API_EXPORT(noit_conf_section_t)

src/noit_conf_checks.c

@@ -52 +52 @@
-#include "utils/noit_log.h"
-
-
+heck_c
-
-static struct _valid_attr_t {
@@ -90 +90 @@
-static noit_hash_table check_attrs = NOIT_HASH_EMPTY;
-
-f_checks_init(const char *toplevel
+sole_conf_checks_init(
-  int i;
-  for(i=0;i<sizeof(valid_attrs)/sizeof(*valid_attrs);i++) {
@@ -97 +97 @@
-                    &valid_attrs[i]);
-  }
-
-
-
-
-
-
-
-
-
-
+
-}
-
@@ -585 +576 @@
-}
-static int
-noit_console_state_conf_terminal(noit_console_closure_t ncct,
-                                 int argc, char **argv,
-                                 noit_console_state_t *state, void *closure) {
-  noit_conf_t_userdata_t *info;
-  if(argc) {
-    nc_printf(ncct, "extra arguments not expected.\n");
-    return -1;
-  }
-  info = calloc(1, sizeof(*info));
-  info->path = strdup("/");
-  noit_console_userdata_set(ncct, NOIT_CONF_T_USERDATA, info,
-                            conf_t_userdata_free);
-  noit_console_state_push_state(ncct, state);
-  noit_console_state_init(ncct);
-  return 0;
-}
-static int
-noit_console_config_section(noit_console_closure_t ncct,
-                            int argc, char **argv,
-                            noit_console_state_t *state, void *closure) {
-  const char *err = "internal error";
-  char *path, xpath[1024];
-  noit_conf_t_userdata_t *info;
-  xmlXPathObjectPtr pobj = NULL;
-  xmlXPathContextPtr xpath_ctxt = NULL;
-  xmlNodePtr node = NULL, newnode;
-  vpsized_int delete = (vpsized_int)closure;
-
-  noit_conf_xml_xpath(NULL, &xpath_ctxt);
-  if(argc != 1) {
-    nc_printf(ncct, "requires one argument\n");
-    return -1;
-  }
-  if(strchr(argv[0], '/')) {
-    nc_printf(ncct, "invalid section name\n");
-    return -1;
-  }
-  if(!strcmp(argv[0], "check")) {
-    nc_printf(ncct, "use 'check' to create checks\n");
-    return -1;
-  }
-  if(!strcmp(argv[0], "filterset")) {
-    nc_printf(ncct, "use 'filterset' to create checks\n");
-    return -1;
-  }
-  if(!strcmp(argv[0], "config")) {
-    nc_printf(ncct, "use 'config' to set check config options\n");
-    return -1;
-  }
-  info = noit_console_userdata_get(ncct, NOIT_CONF_T_USERDATA);
-  if(!strcmp(info->path, "/")) {
-    nc_printf(ncct, "manipulation of toplevel section disallowed\n");
-    return -1;
-  }
-
-  if(delete) {
-    /* We cannot delete if we have checks */
-    snprintf(xpath, sizeof(xpath), "/noit%s/%s//check", info->path, argv[0]);
-    pobj = xmlXPathEval((xmlChar *)xpath, xpath_ctxt);
-    if(!pobj || pobj->type != XPATH_NODESET ||
-       !xmlXPathNodeSetIsEmpty(pobj->nodesetval)) {
-      err = "cannot delete section, has checks";
-      goto bad;
-    }
-    if(pobj) xmlXPathFreeObject(pobj);
-  }
-
-  snprintf(xpath, sizeof(xpath), "/noit%s/%s", info->path, argv[0]);
-  pobj = xmlXPathEval((xmlChar *)xpath, xpath_ctxt);
-  if(!pobj || pobj->type != XPATH_NODESET) {
-    err = "internal error: cannot detect section";
-    goto bad;
-  }
-  if(!delete && !xmlXPathNodeSetIsEmpty(pobj->nodesetval)) {
-    if(xmlXPathNodeSetGetLength(pobj->nodesetval) == 1) {
-      node = xmlXPathNodeSetItem(pobj->nodesetval, 0);
-      if(info->path) free(info->path);
-      info->path = strdup((char *)xmlGetNodePath(node) + strlen("/noit"));
-      goto cdout;
-    }
-    err = "cannot create section";
-    goto bad;
-  }
-  if(delete && xmlXPathNodeSetIsEmpty(pobj->nodesetval)) {
-    err = "no such section";
-    goto bad;
-  }
-  if(delete) {
-    node = (noit_conf_section_t)xmlXPathNodeSetItem(pobj->nodesetval, 0);
-    xmlUnlinkNode(node);
-    noit_conf_mark_changed();
-    return 0;
-  }
-  if(pobj) xmlXPathFreeObject(pobj);
-
-  path = strcmp(info->path, "/") ? info->path : "";
-  snprintf(xpath, sizeof(xpath), "/noit%s", path);
-  pobj = xmlXPathEval((xmlChar *)xpath, xpath_ctxt);
-  if(!pobj || pobj->type != XPATH_NODESET ||
-     xmlXPathNodeSetGetLength(pobj->nodesetval) != 1) {
-    err = "path invalid?";
-    goto bad;
-  }
-  node = (noit_conf_section_t)xmlXPathNodeSetItem(pobj->nodesetval, 0);
-  if((newnode = xmlNewChild(node, NULL, (xmlChar *)argv[0], NULL)) != NULL) {
-    noit_conf_mark_changed();
-    if(info->path) free(info->path);
-    info->path = strdup((char *)xmlGetNodePath(newnode) + strlen("/noit"));
-  }
-  else {
-    err = "failed to create section";
-    goto bad;
-  }
- cdout:
-  if(pobj) xmlXPathFreeObject(pobj);
-  return 0;
- bad:
-  if(pobj) xmlXPathFreeObject(pobj);
-  nc_printf(ncct, "%s\n", err);
-  return -1;
-}
-
-int
-noit_console_config_cd(noit_console_closure_t ncct,
-                       int argc, char **argv,
-                       noit_console_state_t *state, void *closure) {
-  const char *err = "internal error";
-  char *path, xpath[1024];
-  noit_conf_t_userdata_t *info;
-  xmlXPathObjectPtr pobj = NULL;
-  xmlXPathContextPtr xpath_ctxt = NULL, current_ctxt;
-  xmlNodePtr node = NULL;
-  char *dest;
-
-  noit_conf_xml_xpath(NULL, &xpath_ctxt);
-  if(argc != 1 && !closure) {
-    nc_printf(ncct, "requires one argument\n");
-    return -1;
-  }
-  dest = argc ? argv[0] : (char *)closure;
-  info = noit_console_userdata_get(ncct, NOIT_CONF_T_USERDATA);
-  if(dest[0] == '/')
-    snprintf(xpath, sizeof(xpath), "/noit%s", dest);
-  else {
-    snprintf(xpath, sizeof(xpath), "/noit%s/%s", info->path, dest);
-  }
-  if(xpath[strlen(xpath)-1] == '/') xpath[strlen(xpath)-1] = '\0';
-
-  current_ctxt = xpath_ctxt;
-  pobj = xmlXPathEval((xmlChar *)xpath, current_ctxt);
-  if(!pobj || pobj->type != XPATH_NODESET ||
-     xmlXPathNodeSetIsEmpty(pobj->nodesetval)) {
-    err = "no such section";
-    goto bad;
-  }
-  if(xmlXPathNodeSetGetLength(pobj->nodesetval) > 1) {
-    err = "ambiguous section";
-    goto bad;
-  }
-
-  node = (noit_conf_section_t)xmlXPathNodeSetItem(pobj->nodesetval, 0);
-  if(!strcmp((char *)node->name, "check")) {
-    err = "can't cd into a check, use 'check' instead";
-    goto bad;
-  }
-  path = (char *)xmlGetNodePath(node);
-  if(strncmp(path, "/noit/", strlen("/noit/")) && strcmp(path, "/noit")) {
-    err = "new path outside out tree";
-    goto bad;
-  }
-  free(info->path);
-  if(!strcmp(path, "/noit"))
-    info->path = strdup("/");
-  else
-    info->path = strdup((char *)xmlGetNodePath(node) + strlen("/noit"));
-  if(pobj) xmlXPathFreeObject(pobj);
-  if(closure) noit_console_state_pop(ncct, argc, argv, NULL, NULL);
-  return 0;
- bad:
-  if(pobj) xmlXPathFreeObject(pobj);
-  nc_printf(ncct, "%s [%s]\n", err, xpath);
-  return -1;
-}
-static int
-noit_console_config_show(noit_console_closure_t ncct,
-                         int argc, char **argv,
@@ -969 +776 @@
-    snprintf(info->prompt, sizeof(info->prompt), pfmt, "[", uuid_str, "]");
-  }
-  return info->prompt;
-}
-static char *
-conf_t_prompt(EditLine *el) {
-  noit_console_closure_t ncct;
-  noit_conf_t_userdata_t *info;
-  static char *tl = "noit(conf)# ";
-  static char *pfmt = "noit(conf:%s%s)# ";
-  int path_len, max_len;
-
-  el_get(el, EL_USERDATA, (void *)&ncct);
-  if(!ncct) return tl;
-  info = noit_console_userdata_get(ncct, NOIT_CONF_T_USERDATA);
-  if(!info) return tl;
-
-  path_len = strlen(info->path);
-  max_len = sizeof(info->prompt) - (strlen(pfmt) - 4 /* %s%s */) - 1 /* \0 */;
-  if(path_len > max_len)
-    snprintf(info->prompt, sizeof(info->prompt),
-             pfmt, "...", info->path + path_len - max_len + 3 /* ... */);
-  else
-    snprintf(info->prompt, sizeof(info->prompt), pfmt, "", info->path);
-  return info->prompt;
-}
@@ -1325 +1110 @@
-
-static
-
-
-
-
-
-
+
+
+
+
-
-  tl = noit_console_state_initial();
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-  /* attribute <attrname> <value> */
-  NEW_STATE(_attr_state);
@@ -1350 +1132 @@
-  noit_console_state_add_check_attrs(_uattr_state, noit_conf_check_unset_attr,
-                                     "/checks");
-
-  NEW_STATE(_unset_state);
-  DELEGATE_CMD(_unset_state, "attribute",
-               noit_console_opt_delegate, _uattr_state);
-  ADD_CMD(_unset_state, "section",
-          noit_console_config_section, NULL, NULL, (void *)1);
-  ADD_CMD(_unset_state, "config",
-          noit_console_config_unsetconfig, NULL, NULL, NULL);
-
+
+
+
+
+
+
-          noit_console_config_nocheck, NULL, NULL, NULL);
- 
@@ -1377 +1161 @@
-          _conf_t_check_state, "..");
-
-
-
-
-
-
-
+
-          noit_console_config_setconfig, NULL, NULL, NULL);
-
-
-
+
-          noit_console_check, noit_console_conf_check_opts,
-          _conf_t_check_state, NULL);
-
-  showcmd = noit_console_state_get_cmd(tl, "show");
-  ADD_CMD(showcmd->dstate, "check",
-          noit_console_show_check, noit_console_check_opts, NULL, NULL);
@@ -1397 +1173 @@
-          noit_console_watch_check, noit_console_check_opts, NULL, (void *)1);
-
-  nocmd = noit_console_state_get_cmd(tl, "no");
-  ADD_CMD(nocmd->dstate, "watch",
-          noit_console_watch_check, noit_console_check_opts, NULL, (void *)0);
-
-
-
-
+
-               noit_console_opt_delegate, _attr_state);
-
-
-
-
-
-
-
-
-
-
-
-
+
-  ADD_CMD(tl, "reload", noit_conf_checks_reload, NULL, NULL, NULL);
-}

src/noit_conf_checks.h

@@ -38 +38 @@
-#include "noit_console.h"
-
-f_checks_init(const char *toplevel
+sole_conf_checks_init(
-API_EXPORT(int)
-  noit_console_config_cd(noit_console_closure_t ncct,

src/noitd.c

@@ -181 +181 @@
-  /* Initialize all of our listeners */
-  noit_console_init(APPNAME);
+  noit_console_conf_init();
+  noit_console_conf_checks_init();
-  noit_capabilities_listener_init();
-  noit_jlog_listener_init();
@@ -226 +228 @@
-  /* Next load the configs */
-  noit_conf_init(APPNAME);
-  noit_conf_checks_init(APPNAME);
-  if(noit_conf_load(config_file) == -1) {
-    fprintf(stderr, "Cannot load config: '%s'\n", config_file);

src/stratcon_iep.h

@@ -38 +38 @@
-#include "utils/noit_hash.h"
-#include "stratcon_datastore.h"
+#include "stratcon_jlog_streamer.h"
-
-#include <sys/types.h>
@@ -49 +50 @@
-                              struct sockaddr *remote, void *operand);
-
+API_EXPORT(jlog_streamer_ctx_t *)
+  stratcon_jlog_streamer_iep_ctx_alloc(void);
+
-#endif

src/stratcon_jlog_streamer.c

@@ -40 +40 @@
-#include "stratcon_datastore.h"
-#include "stratcon_jlog_streamer.h"
+#include "stratcon_iep.h"
-
-#include <unistd.h>
@@ -73 +74 @@
-nc_print_noit_conn_brief(noit_console_closure_t ncct,
-                          noit_connection_ctx_t *ctx) {
+  jlog_streamer_ctx_t *jctx = ctx->consumer_ctx;
-  struct timeval now, diff, session_duration;
-gettimeofday(&now, NULL)
+const char *feedtype = "unknown"
-  const char *lasttime = "never";
-  if(ctx->last_connect.tv_sec != 0) {
@@ -85 +87 @@
-  }
-  nc_printf(ncct, "%s [%s]:\n\tLast connect: %s\n", ctx->remote_str,
-
+
+
+
+
+
+
+
+
+
-  if(ctx->timeout_event) {
-
-
-
-
+
+
+
+
+
-    nc_printf(ncct, "\tRemote CN: '%s'\n",
-              ctx->remote_cn ? ctx->remote_cn : "???");
-    if(ctx->consumer_callback == stratcon_jlog_recv_handler) {
-      jlog_streamer_ctx_t *jctx = ctx->consumer_ctx;
-      struct timeval last;
-      double session_duration_seconds;
-      const char *feedtype = "unknown";
-      const char *state = "unknown";
-
-      switch(ntohl(jctx->jlog_feed_cmd)) {
-        case NOIT_JLOG_DATA_FEED: feedtype = "durable/storage"; break;
-        case NOIT_JLOG_DATA_TEMP_FEED: feedtype = "transient/iep"; break;
-      }
-      switch(jctx->state) {
-        case JLOG_STREAMER_WANT_INITIATE: state = "initiate"; break;
@@ -118 +123 @@
-      session_duration_seconds = session_duration.tv_sec +
-                                 (double)session_duration.tv_usec/1000000.0;
-JLog event streamer [%s]\n\t
+
-                      "\tNext checkpoint: [%08x:%08x]\n"
-                      "\tLast event: %llu.%06us ago\n"
-                      "\tEvents this session: %llu (%0.2f/s)\n"
-                      "\tOctets this session: %llu (%0.2f/s)\n",
-feedtype, 
+
-                jctx->header.chkpt.log, jctx->header.chkpt.marker,
-diff.tv_sec, 
+(unsigned long long)diff.tv_sec, (unsigned int)
-                jctx->total_events,
-                (double)jctx->total_events/session_duration_seconds,
@@ -743 +748 @@
-}
-
-static void
-register_console_streamer_commands() {
-  noit_console_state_t *tl;
-  cmd_info_t *showcmd;
-
-  tl = noit_console_state_initial();
-  showcmd = noit_console_state_get_cmd(tl, "show");
-  assert(showcmd && showcmd->dstate);
-
-  noit_console_state_add_cmd(showcmd->dstate,
-    NCSCMD("noits", stratcon_console_show_noits, NULL, NULL, NULL));
-}
-
-static int
-rest_show_noits(noit_http_rest_closure_t *restc,
@@ -794 +786 @@
-             (int)ctx->last_connect.tv_usec);
-    xmlSetProp(node, (xmlChar *)"last_connect", (xmlChar *)buff);
-
-
+
+
+
+
+
+
+
+
+
+
-    if(ctx->timeout_event) {
-now, ctx->timeout_event->whence
+ctx->timeout_event->whence, now
-      snprintf(buff, sizeof(buff), "%llu.%06d",
-               (long long unsigned)diff.tv_sec, (int)diff.tv_usec);
-      xmlSetProp(node, (xmlChar *)"next_attempt", (xmlChar *)buff);
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      snprintf(buff, sizeof(buff), "%llu.%06d",
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -858 +854 @@
-  return 0;
-}
+static int
+stratcon_add_noit(const char *target, unsigned short port) {
+  int cnt;
+  char path[256];
+  char port_str[6];
+  noit_conf_section_t *noit_configs, parent;
+  xmlNodePtr newnoit;
+
+  snprintf(path, sizeof(path),
+           "//noits//noit[@address=\"%s\" and @port=\"%d\"]", target, port);
+  noit_configs = noit_conf_get_sections(NULL, path, &cnt);
+  free(noit_configs);
+  if(cnt != 0) return 0;
+
+  parent = noit_conf_get_section(NULL, "//noits");
+  if(!parent) return 0;
+  snprintf(port_str, sizeof(port_str), "%d", port);
+  newnoit = xmlNewNode(NULL, (xmlChar *)"noit");
+  xmlSetProp(newnoit, (xmlChar *)"address", (xmlChar *)target);
+  xmlSetProp(newnoit, (xmlChar *)"port", (xmlChar *)port_str);
+  xmlAddChild(parent, newnoit);
+  noit_conf_mark_changed();
+  stratcon_streamer_connection(NULL, target,
+                               stratcon_jlog_recv_handler,
+                               (void *(*)())stratcon_jlog_streamer_datastore_ctx_alloc,
+                               NULL,
+                               jlog_streamer_ctx_free);
+  stratcon_streamer_connection(NULL, target,
+                               stratcon_jlog_recv_handler,
+                               (void *(*)())stratcon_jlog_streamer_iep_ctx_alloc,
+                               NULL,
+                               jlog_streamer_ctx_free);
+  return 1;
+}
+static int
+stratcon_remove_noit(const char *target, unsigned short port) {
+  noit_hash_iter iter = NOIT_HASH_ITER_ZERO;
+  uuid_t key_id;
+  int klen, n = 0, i, cnt = 0;
+  void *vconn;
+  noit_connection_ctx_t **ctx;
+  noit_conf_section_t *noit_configs;
+  char path[256];
+  char remote_str[256];
+
+  snprintf(remote_str, sizeof(remote_str), "%s:%d", target, port);
+
+  snprintf(path, sizeof(path),
+           "//noits//noit[@address=\"%s\" and @port=\"%d\"]", target, port);
+  noit_configs = noit_conf_get_sections(NULL, path, &cnt);
+  for(i=0; i<cnt; i++) {
+    xmlUnlinkNode(noit_configs[i]);
+    xmlFreeNode(noit_configs[i]);
+  }
+  free(noit_configs);
+  noit_conf_mark_changed();
+
+  pthread_mutex_lock(&noits_lock);
+  ctx = malloc(sizeof(*ctx) * noits.size);
+  while(noit_hash_next(&noits, &iter, (const char **)key_id, &klen,
+                       &vconn)) {
+    if(!strcmp(((noit_connection_ctx_t *)vconn)->remote_str, remote_str)) {
+      ctx[n] = (noit_connection_ctx_t *)vconn;
+      noit_atomic_inc32(&ctx[n]->refcnt);
+      n++;
+    }
+  }
+  pthread_mutex_unlock(&noits_lock);
+  for(i=0; i<n; i++) {
+    noit_connection_ctx_dealloc(ctx[i]); /* once for the record */
+    noit_connection_ctx_deref(ctx[i]);   /* once for the aboce inc32 */
+  }
+  free(ctx);
+  return n;
+}
+static int
+stratcon_console_conf_noits(noit_console_closure_t ncct,
+                            int argc, char **argv,
+                            noit_console_state_t *dstate,
+                            void *closure) {
+  char *cp, target[128];
+  unsigned short port = 43191;
+  int adding = (int)closure;
+  if(argc != 1)
+    return -1;
+
+  cp = strchr(argv[0], ':');
+  if(cp) {
+    strlcpy(target, argv[0], MIN(sizeof(target), cp-argv[0]+1));
+    port = atoi(cp+1);
+  }
+  else strlcpy(target, argv[0], sizeof(target));
+  if(adding) {
+    if(stratcon_add_noit(target, port)) {
+      nc_printf(ncct, "Added noit at %s:%d\n", target, port);
+    }
+    else {
+      nc_printf(ncct, "Failed to add noit at %s:%d\n", target, port);
+    }
+  }
+  else {
+    if(stratcon_remove_noit(target, port)) {
+      nc_printf(ncct, "Removed noit at %s:%d\n", target, port);
+    }
+    else {
+      nc_printf(ncct, "Failed to remove noit at %s:%d\n", target, port);
+    }
+  }
+  return 0;
+}
+
+static void
+register_console_streamer_commands() {
+  noit_console_state_t *tl;
+  cmd_info_t *showcmd, *confcmd, *conftcmd, *conftnocmd;
+
+  tl = noit_console_state_initial();
+  showcmd = noit_console_state_get_cmd(tl, "show");
+  assert(showcmd && showcmd->dstate);
+  confcmd = noit_console_state_get_cmd(tl, "configure");
+  conftcmd = noit_console_state_get_cmd(confcmd->dstate, "terminal");
+  conftnocmd = noit_console_state_get_cmd(conftcmd->dstate, "no");
+
+  noit_console_state_add_cmd(conftcmd->dstate,
+    NCSCMD("noit", stratcon_console_conf_noits, NULL, NULL, (void *)1));
+  noit_console_state_add_cmd(conftnocmd->dstate,
+    NCSCMD("noit", stratcon_console_conf_noits, NULL, NULL, (void *)0));
+
+  noit_console_state_add_cmd(showcmd->dstate,
+    NCSCMD("noits", stratcon_console_show_noits, NULL, NULL, NULL));
+}
+
+
-void
-stratcon_jlog_streamer_init(const char *toplevel) {
@@ -875 +1004 @@
-  ) == 0);
-}
+

src/stratcond.c

@@ -172 +172 @@
-
-  noit_console_init(APPNAME);
+  noit_console_conf_init();
-  noit_http_rest_init();
-  stratcon_realtime_http_init(APPNAME);