Skip to content

Commit

Permalink
partially negotiate char-at-a-time telnet mode
Browse files Browse the repository at this point in the history
  • Loading branch information
@vvisigoth
vvisigoth committed Jun 7, 2014
1 parent 4b6a363 commit c38d4b5
Show file tree
Hide file tree
Showing 5 changed files with 104 additions and 39 deletions.
11 changes: 9 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ CFLAGS= -O2 -g \
-I/opt/local/include \
-I$(INCLUDE) \
-Ioutside/libuv/include \
-Ioutside/anachronism/include \
-Ioutside/bpt \
-Ioutside/re2 \
-Ioutside/cre2/src/src \
Expand Down Expand Up @@ -292,6 +293,8 @@ LIBRE2=outside/re2/obj/libre2.a

LIBED25519=outside/ed25519/ed25519.a

LIBANACHRONISM=outside/anachronism/build/libanachronism.a

BPT_O=outside/bpt/bitmapped_patricia_tree.o

all: $(BIN)/vere
Expand All @@ -305,6 +308,9 @@ $(LIBRE2):
$(LIBED25519):
$(MAKE) -C outside/ed25519

$(LIBANACHRONISM):
$(MAKE) -C outside/anachronism static

$(BPT_O): outside/bpt/bitmapped_patricia_tree.c
$(CC) -g -O2 -o $@ -c $<

Expand All @@ -313,9 +319,9 @@ $(CRE2_OFILES): outside/cre2/src/src/cre2.cpp outside/cre2/src/src/cre2.h $(LIBR

$(V_OFILES) f/loom.o f/trac.o: include/v/vere.h

$(BIN)/vere: $(LIBCRE) $(VERE_OFILES) $(LIBUV) $(LIBRE2) $(LIBED25519) $(BPT_O)
$(BIN)/vere: $(LIBCRE) $(VERE_OFILES) $(LIBUV) $(LIBRE2) $(LIBED25519) $(BPT_O) $(LIBANACHRONISM)
mkdir -p $(BIN)
$(CLD) $(CLDOSFLAGS) -o $(BIN)/vere $(VERE_OFILES) $(LIBUV) $(LIBCRE) $(LIBRE2) $(LIBED25519) $(BPT_O) $(LIBS)
$(CLD) $(CLDOSFLAGS) -o $(BIN)/vere $(VERE_OFILES) $(LIBUV) $(LIBCRE) $(LIBRE2) $(LIBED25519) $(BPT_O) $(LIBANACHRONISM) $(LIBS)

tags:
ctags -R -f .tags --exclude=root
Expand Down Expand Up @@ -349,6 +355,7 @@ distclean: clean
$(MAKE) -C outside/libuv clean
$(MAKE) -C outside/re2 clean
$(MAKE) -C outside/ed25519 clean
$(MAKE) -C outside/anachronism clean
$(RM) $(BPT_O)

.PHONY: clean distclean
15 changes: 8 additions & 7 deletions include/v/vere.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -414,13 +414,6 @@
};
#endif

/* u2_utel: unix telnet listener.
*/
typedef struct _u2_utel {
uv_tcp_t wax_u;
c3_s por_s; // file descriptor
} u2_utel;

/* u2_utty: unix tty.
*/
typedef struct _u2_utty {
Expand All @@ -439,6 +432,14 @@
struct termios raw_u; // raw terminal state
} u2_utty;

/* u2_utel: unix telnet listener.
*/
typedef struct _u2_utel {
struct _u2_utty uty_t; // pseudo-tty
c3_s por_s; // file descriptor
void* tel_u; // telnet context
} u2_utel;

/* u2_raty: raft server type.
*/
typedef enum {
Expand Down
4 changes: 3 additions & 1 deletion urb/zod/arvo/batz.hoon
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
++ kiss :: in request ->$
$% [%crud p=@tas q=(list tank)] :: error with trace
[%hail ~] :: refresh
[%hook ~] :: this term hung up
[%harm ~] :: all terms hung up
[%init p=@p] :: report install
[%kill p=~] :: kill a task
Expand Down Expand Up @@ -270,7 +271,8 @@
?- -.kyz
%crud [[[hen [%slip %d %flog kyz]] ~] +<.^^$]
%hail [[[hen [%give %helo prot]] ~] +<.^^$]
%harm ~&(%batz-hole [~ +<.^^$])
%harm ~&(%batz-harm [~ +<.^^$])
%hook ~&(%batz-hook [~ +<.^^$])
%line =+ gyp=?>(?=(^ fog) i.fog)
?: &(=(0 gyp) =(%$ p.kyz)) $(kyz [%hail ~])
=< abet
Expand Down
5 changes: 5 additions & 0 deletions urb/zod/arvo/dill.hoon
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
[%crud p=@tas q=(list tank)] :: error with trace
[%flog p=flog] :: wrapped error
[%hail ~] :: terminal refresh
[%hook ~] :: this term hung up
[%harm ~] :: all terms hung up
[%noop ~] :: no operation
[%talk p=tank] ::
Expand All @@ -34,6 +35,7 @@
$% [%crud p=@tas q=(list tank)] :: to %dill
[%hail ~] :: to %batz
[%harm ~] :: to %batz
[%hook ~] :: to %batz
[%kill p=~] :: to %batz
[%line p=@t] :: to %batz
[%ling ~] :: to %batz
Expand Down Expand Up @@ -495,6 +497,9 @@
dug nug
mos :_(mos [hen %toss %b ~ kyz])
==
::
%hook :: this term hung up
+>.$(dug (~(del by dug) hen), mos :_(mos [hen %toss %b ~ kyz]))
::
%talk (furl (~(win re p.kyz) 0 p.q.yar)) :: program output
%text $(kyz [%talk %leaf p.kyz]) :: simple message
Expand Down
108 changes: 79 additions & 29 deletions v/term.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,15 @@
#include <curses.h>
#include <termios.h>
#include <term.h>

#include <anachronism/common.h>
#include <anachronism/nvt.h>
#include "all.h"
#include "v/vere.h"

static void _term_read_tn_cb(uv_stream_t*, ssize_t, uv_buf_t);
static void _term_read_cb(uv_stream_t*, ssize_t, uv_buf_t);
static void _term_suck(u2_utty*, const c3_y*, ssize_t);
static void _tel_event(telnet_nvt* nvt, telnet_event* evt);

/* _term_alloc(): libuv buffer allocator.
*/
Expand Down Expand Up @@ -60,6 +63,16 @@ _term_close_cb(uv_handle_t* han_t)
free(tty_u);
}

/* _tel_close_cb(): close telnet terminal
*/
static void
_tel_close_cb(uv_handle_t* han_t)
{
u2_utel* pty_u = (u2_utel*)(void*)han_t;
telnet_nvt_free(pty_u->tel_u);
_term_close_cb(han_t);
}

/* u2_term_io_init(): initialize terminal.
*/
void
Expand Down Expand Up @@ -222,7 +235,8 @@ u2_term_io_init()
void
_term_listen_cb(uv_stream_t *wax_u, int sas_i)
{
u2_utty* tty_u = calloc(1, sizeof(*tty_u));
u2_utel* pty_u = calloc(1, sizeof(*pty_u));
u2_utty* tty_u = &pty_u->uty_t;
uv_tcp_init(u2L, &tty_u->wax_u);
if ( 0 != uv_accept(wax_u, (uv_stream_t*)&tty_u->wax_u) ) {
uL(fprintf(uH, "term: accept: %s\n",
Expand Down Expand Up @@ -266,11 +280,13 @@ _term_listen_cb(uv_stream_t *wax_u, int sas_i)
tty_u->tid_l = u2_Host.uty_u->tid_l + 1;
tty_u->nex_u = u2_Host.uty_u;
u2_Host.uty_u = tty_u;

pty_u->tel_u = telnet_nvt_new(tty_u, _tel_event, NULL, NULL);
telnet_telopt_enable(pty_u->tel_u, 1, TELNET_LOCAL); /* ECHO */
telnet_telopt_enable(pty_u->tel_u, 3, TELNET_LOCAL); /* SUPPRESS GA */
{
u2_noun tid = u2_dc("scot", c3__ud, tty_u->tid_l);
u2_noun pax = u2nq(c3__gold, c3__term, tid, u2_nul);
u2_reck_plan(u2A, u2k(pax), u2nc(c3__blew, u2_term_get_blew(1)));
// u2_reck_plan(u2A, u2k(pax), u2nc(c3__blew, u2_term_get_blew(1)));
u2_reck_plan(u2A, u2k(pax), u2nc(c3__hail, u2_nul));
u2z(pax);
}
Expand All @@ -283,7 +299,7 @@ u2_term_io_talk(void)
struct sockaddr_in add_u;
u2_utel* tel_u = &u2_Host.tel_u;

uv_tcp_init(u2L, &tel_u->wax_u);
uv_tcp_init(u2L, &tel_u->uty_t.wax_u);
tel_u->por_s = 10023;

memset(&add_u, 0, sizeof(add_u));
Expand All @@ -295,7 +311,7 @@ u2_term_io_talk(void)
while ( 1 ) {
add_u.sin_port = htons(tel_u->por_s);

if ( 0 != uv_tcp_bind(&tel_u->wax_u, add_u) ) {
if ( 0 != uv_tcp_bind(&tel_u->uty_t.wax_u, add_u) ) {
uv_err_t las_u = uv_last_error(u2L);

if ( UV_EADDRINUSE == las_u.code ) {
Expand All @@ -306,7 +322,9 @@ u2_term_io_talk(void)
uL(fprintf(uH, "term: bind: %s\n", uv_strerror(las_u)));
}
}
if ( 0 != uv_listen((uv_stream_t*)&tel_u->wax_u, 16, _term_listen_cb) ) {
if ( 0 != uv_listen((uv_stream_t*)&tel_u->uty_t.wax_u,
16, _term_listen_cb) )
{
uv_err_t las_u = uv_last_error(u2L);

if ( UV_EADDRINUSE == las_u.code ) {
Expand Down Expand Up @@ -640,6 +658,39 @@ _term_io_belt(u2_utty* uty_u, u2_noun blb)
u2_reck_plan(u2A, pax, u2nc(c3__belt, blb));
}

/* _tel_event: telnet sucker
*/
#define _te_nvt telnet_nvt
#define _te_evt telnet_event
#define _te_dvt telnet_data_event
#define _te_svt telnet_send_event
static void
_tel_event(_te_nvt* nvt, _te_evt* evt)
{
u2_utel* tel_u;
c3_assert(0 < telnet_get_userdata(nvt, (void**)&tel_u));
switch (evt->type)
{
case TELNET_EV_DATA:
{
_te_dvt* dv = (_te_dvt*)evt;
_term_suck((u2_utty*)tel_u, dv->data, dv->length);
break;
}

case TELNET_EV_SEND:
{
_te_svt* sv = (_te_svt*)evt;
_term_it_write_bytes((u2_utty*)tel_u, sv->length, sv->data);
break;
}
default:
{
break;
}
}
}

/* _term_io_suck_char(): process a single character.
*/
static void
Expand Down Expand Up @@ -731,25 +782,20 @@ _term_read_tn_cb(uv_stream_t* str_u,
ssize_t siz_i,
uv_buf_t buf_u)
{
u2_utty* uty_u = (u2_utty*)(void*)str_u;
u2_utel* pty_u = (u2_utel*)(void*)str_u;

u2_lo_open();
{
if ( siz_i < 0 ) {
uv_err_t las_u = uv_last_error(u2L);

uL(fprintf(uH, "term %d: read: %s\n", uty_u->tid_l, uv_strerror(las_u)));
uv_close((uv_handle_t*)str_u, _term_close_cb);
uL(fprintf(uH, "term %d: read: %s\n",
pty_u->uty_t.tid_l, uv_strerror(las_u)));
uv_close((uv_handle_t*)str_u, _tel_close_cb);
goto err;
}
else {
c3_i i;

for ( i=0; i < siz_i; i++ ) {
if ( 10 != buf_u.base[i] ) {
_term_io_suck_char(uty_u, buf_u.base[i]);
}
}
telnet_receive(pty_u->tel_u, (const telnet_byte*)buf_u.base, siz_i, 0);
}

err:
Expand All @@ -758,15 +804,11 @@ _term_read_tn_cb(uv_stream_t* str_u,
u2_lo_shut(u2_yes);
}

/* _term_read_cb(): server read callback.
/* _term_suck(): process a chunk of input
*/
static void
_term_read_cb(uv_stream_t* str_u,
ssize_t siz_i,
uv_buf_t buf_u)
static inline void
_term_suck(u2_utty* uty_u, const c3_y* buf, ssize_t siz_i)
{
u2_utty* uty_u = (u2_utty*)(void*)str_u;

u2_lo_open();
{
if ( siz_i < 0 ) {
Expand All @@ -778,17 +820,25 @@ _term_read_cb(uv_stream_t* str_u,
c3_i i;

for ( i=0; i < siz_i; i++ ) {
_term_io_suck_char(uty_u, buf_u.base[i]);
_term_io_suck_char(uty_u, buf[i]);
}
}

if ( buf_u.base ) {
free(buf_u.base);
}
}
u2_lo_shut(u2_yes);
}

/* _term_read_cb(): server read callback.
*/
static void
_term_read_cb(uv_stream_t* str_u,
ssize_t siz_i,
uv_buf_t buf_u)
{
u2_utty* uty_u = (u2_utty*)(void*)str_u;
_term_suck(uty_u, (const c3_y*)buf_u.base, siz_i);
free(buf_u.base);
}

/* _term_main(): return main or console terminal.
*/
static u2_utty*
Expand Down

0 comments on commit c38d4b5

Please sign in to comment.