Changeset a7f575acc420cc6e5ca474d23cf07149299a3bbd

Timestamp:

02/09/08 06:05:17 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[1d69a01311e58ce6ddb007d690b4e9aa4ac08c8c]

git-author:

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

Message:

start the framework for a console state machine

Files:

• src/Makefile.in (modified) (1 diff)
• src/noit_console.c (modified) (9 diffs)
• src/noit_console.h (modified) (4 diffs)
• src/noit_console_state.c (added)

src/Makefile.in

@@ -25 +25 @@
-SUBS=utils jlog eventer modules noitedit
-
-
+
+
-        noit_check.o \
-        noit_module.o noit_conf.o noit_tokenizer.o

src/noit_console.c

@@ -24 +24 @@
-#include "noit_tokenizer.h"
-
+static void
+nc_telnet_cooker(noit_console_closure_t ncct) {
+  char *tmpbuf, *p, *n;
+  int r;
+
+  tmpbuf = ncct->outbuf;
+  if(ncct->outbuf_len == 0) return;
+
+  p = ncct->outbuf + ncct->outbuf_completed;
+  r = ncct->outbuf_len - ncct->outbuf_completed;
+  n = memchr(p, '\n', r);
+  /* No '\n'? Nothin' to do */
+  if(!n) {
+    ncct->outbuf_cooked = ncct->outbuf_len;
+    return;
+  }
+
+  /* Forget the outbuf -- it is now tmpbuf */
+  ncct->outbuf = NULL;
+  ncct->outbuf_allocd = 0;
+  ncct->outbuf_len = 0;
+  ncct->outbuf_completed = 0;
+  ncct->outbuf_cooked = 0;
+  do {
+    if(n == tmpbuf || *(n-1) != '\r') {
+      nc_write(ncct, p, n-p);   r -= n-p;
+      nc_write(ncct, "\r", 1);
+      p = n;
+    }
+    n = memchr(p+1, '\n', r-1);
+  } while(n);
+  nc_write(ncct, p, r);
+  ncct->outbuf_cooked = ncct->outbuf_len;
+  free(tmpbuf);
+}
-int
-nc_printf(noit_console_closure_t ncct, const char *fmt, ...) {
@@ -104 +139 @@
-  if(ncct->outbuf) free(ncct->outbuf);
-  if(ncct->telnet) noit_console_telnet_free(ncct->telnet);
+  while(ncct->state) {
+    noit_console_state_t *tmp;
+    tmp = ncct->state;
+    ncct->state = tmp->stacked;
+    noit_console_state_free(tmp);
+  }
-  free(ncct);
-}
@@ -122 +163 @@
-  eventer_t e = ncct->e;
-  if(!ncct->outbuf_len) return 0;
+  if(ncct->output_cooker) ncct->output_cooker(ncct);
-  while(ncct->outbuf_len > ncct->outbuf_completed) {
-    len = e->opset->write(e->fd, ncct->outbuf + ncct->outbuf_completed,
@@ -136 +178 @@
-  free(ncct->outbuf);
-  ncct->outbuf = NULL;
-0;
-ncct->outbuf_len = ncct->outbuf_complet
+ncct->outbuf_len =
+  ncct->outbuf_completed = ncct->outbuf_cook
-  return len;
-}
@@ -151 +193 @@
-noit_console_dispatch(eventer_t e, const char *buffer,
-                      noit_console_closure_t ncct) {
-cmds[32]
+*cmds
-  int i, cnt = 32;
-
+
+
-  i = noit_tokenize(buffer, cmds, &cnt);
-  if(i>cnt) nc_printf(ncct, "Command length too long.\n");
-
+
+
-  for(i=0;i<cnt;i++) {
-r\
+
-    free(cmds[i]);
-  }
@@ -196 +240 @@
-      el_set(ncct->el, EL_HIST, history, ncct->hist);
-      ncct->telnet = noit_console_telnet_alloc(ncct);
+      ncct->output_cooker = nc_telnet_cooker;
+      ncct->state = noit_console_state_initial();
+      noit_console_state_init(ncct);
-    }
-  }
@@ -202 +249 @@
-   * care of that
-   */
-== -1
-
+< 0
+ncct->wants_shutdown || 
-    return newmask | EVENTER_EXCEPTION;
-  }
@@ -218 +265 @@
-
-    len = e->opset->read(e->fd, sbuf, sizeof(sbuf)-1, &newmask, e);
-noitL(noit_stderr, "opset->read => %d bytes\n", len);
-    if(len == 0 || (len < 0 && errno != EAGAIN)) {
-      eventer_remove_fd(e->fd);
@@ -247 +293 @@
-      noit_console_dispatch(e, cmd_buffer, ncct);
-      free(cmd_buffer);
-
-
-
-
-
+
+
+
+
+
+
-  }
-  return newmask | EVENTER_EXCEPTION;

src/noit_console.h

@@ -11 +11 @@
-#include "noitedit/histedit.h"
-#include "noit_console_telnet.h"
+#include "utils/noit_hash.h"
-#include <stdarg.h>
+
+struct _console_state;
+struct __noit_console_closure;
+
+typedef int (*console_cmd_func_t)(struct __noit_console_closure *,
+                                  int, char **);
+typedef char *(*console_prompt_func_t)(EditLine *);
+typedef void (*state_free_func_t)(struct _console_state *);
+
+typedef struct cmd_info {
+  const char          *name;
+  console_cmd_func_t   func;
+} cmd_info_t;
+
+typedef struct _console_state {
+  console_prompt_func_t  console_prompt_function;
+  noit_hash_table        cmds;
+  struct _console_state *stacked;
+  state_free_func_t      statefree;
+} noit_console_state_t;
-
-typedef struct __noit_console_closure {
@@ -22 +43 @@
-  History *hist;
-
+  noit_console_state_t *state;
+
-  int   pty_master;
-  int   pty_slave;
@@ -29 +52 @@
-  int   outbuf_allocd;
-  int   outbuf_len;
+  int   outbuf_cooked;
-  int   outbuf_completed;
-
-  /* This tracks telnet protocol state (if we're doing telnet) */
-  noit_console_telnet_closure_t telnet;
-
-;
+
+
-
-API_EXPORT(void) noit_console_init();
@@ -55 +79 @@
-  noit_console_continue_sending(noit_console_closure_t ncct,
-                                int *mask);
+
+API_EXPORT(int)
+  noit_console_state_init(noit_console_closure_t ncct);
+
+API_EXPORT(char *)
+  noit_console_state_prompt(EditLine *el);
+
+API_EXPORT(int)
+  noit_console_state_pop(noit_console_closure_t ncct, int argc, char **argv);
+
+API_EXPORT(noit_console_state_t *)
+  noit_console_state_initial();
+
+API_EXPORT(void)
+  noit_console_state_free(noit_console_state_t *st);
+
+API_EXPORT(int)
+  noit_console_state_do(noit_console_closure_t ncct, int argc, char **argv);
+
-#endif