Changeset 30700011fc4916bef71870a2bae7739745a7a2bc

Timestamp:

02/07/08 23:17:43 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[31ecb27a3a88da161238c56128d25ddc8e264595]

git-author:

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

Message:

integrate a full-on telnet server... hey, why not?

Files:

• src/Makefile.in (modified) (2 diffs)
• src/noit_console.c (modified) (7 diffs)
• src/noit_console.h (modified) (2 diffs)
• src/noit_console_telnet.c (added)
• src/noit_console_telnet.h (added)

src/Makefile.in

@@ -25 +25 @@
-SUBS=utils jlog eventer modules noitedit
-
-
+
+
-        noit_module.o noit_conf.o noit_tokenizer.o
-
@@ -44 +45 @@
-                -Lutils -lnoit_utils \
-                -Ljlog -ljlog \
+                -Lnoitedit -lnoitedit \
-                $(LIBS)
-

src/noit_console.c

@@ -9 +9 @@
-#include <unistd.h>
-#include <errno.h>
+#include <sys/ioctl.h>
+#include <util.h>
+#include <arpa/telnet.h>
-
-#include "eventer/eventer.h"
@@ -15 +18 @@
-#include "noit_console.h"
-#include "noit_tokenizer.h"
-
-struct __noit_console_closure {
-  char *outbuf;
-  int   outbuf_allocd;
-  int   outbuf_len;
-  int   outbuf_completed;
-};
-
-int
@@ -77 +73 @@
-  return -1;
-}
+int
+nc_write(noit_console_closure_t ncct, void *buf, int len) {
+  if(!ncct->outbuf_allocd) {
+    ncct->outbuf = malloc(len);
+    if(!ncct->outbuf) return 0;
+    ncct->outbuf_allocd = len;
+  }
+  else if(ncct->outbuf_allocd < ncct->outbuf_len + len) {
+    char *newbuf;
+    newbuf = realloc(ncct->outbuf, ncct->outbuf_len + len);
+    if(!newbuf) return 0;
+    ncct->outbuf = newbuf;
+  }
+  memcpy(ncct->outbuf + ncct->outbuf_len, buf, len);
+  ncct->outbuf_len += len;
+  return len;
+}
+
-void
-noit_console_closure_free(noit_console_closure_t ncct) {
+  if(ncct->el) el_end(ncct->el);
+  if(ncct->pty_master >= 0) close(ncct->pty_master);
+  if(ncct->pty_slave >= 0) close(ncct->pty_slave);
-  if(ncct->outbuf) free(ncct->outbuf);
+  if(ncct->telnet) noit_console_telnet_free(ncct->telnet);
-  free(ncct);
-}
@@ -87 +105 @@
-  noit_console_closure_t new_ncct;
-  new_ncct = calloc(1, sizeof(*new_ncct));
+  new_ncct->pty_master = -1;
+  new_ncct->pty_slave = -1;
-  return new_ncct;
-}
-
-int
-eventer_t e, 
+
-                              int *mask) {
-  int len;
+  eventer_t e = ncct->e;
-  if(!ncct->outbuf_len) return 0;
-  while(ncct->outbuf_len > ncct->outbuf_completed) {
@@ -116 +137 @@
-void
-noit_console_init() {
+  el_multi_init();
+  signal(SIGTTOU, SIG_IGN);
-  eventer_name_callback("noit_console", noit_console_handler);
-}
@@ -137 +160 @@
-noit_console_handler(eventer_t e, int mask, void *closure,
-                     struct timeval *now) {
-
+
+
-  noit_console_closure_t ncct = closure;
-
-
+
+
-    /* Exceptions cause us to simply snip the connection */
-    eventer_remove_fd(e->fd);
@@ -148 +173 @@
-  }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  /* If we still have data to send back to the client, this will take
-   * care of that
-   */
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      eventer_remove_fd(e->fd);
-      close(e->fd);
-      return 0;
-    }
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-  return newmask | EVENTER_EXCEPTION;

src/noit_console.h

@@ -9 +9 @@
-#include "noit_defines.h"
-#include "eventer/eventer.h"
+#include "noitedit/histedit.h"
+#include "noit_console_telnet.h"
-
+typedef struct __noit_console_closure {
+  eventer_t e;           /* The event it is attached to.  This
+                          * is needed so it can write itself out */
+  int   wants_shutdown;  /* Set this to 1 to have it die */
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-API_EXPORT(void) noit_console_init();
@@ -27 +46 @@
-  nc_vprintf(noit_console_closure_t ncct, const char *fmt, va_list arg);
-
+API_EXPORT(int)
+  nc_write(noit_console_closure_t ncct, void *buf, int len);
-
+API_EXPORT(int)
+  noit_console_continue_sending(noit_console_closure_t ncct,
+                                int *mask);
-#endif