urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-29 23:23:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

khan: full round trip achieved

Browse Source 
We now take %avow effects and send them back over the wire as a jammed
noun.

At this point the basic driver functionality is in place and should be
working. Still needed to finish this off are:

- Error-handling in the case of a malformed jammed noun.

- Handling requests to close the connection.

- Code review.
This commit is contained in:
Jōshin 2021-10-22 05:20:42 +00:00
parent 21b60615d1
commit 0107c83252
No known key found for this signature in database
GPG Key ID: A8BE5A9A521639D0
2 changed files with 59 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/urbit/include/c/motes.h
View File

@ -26,6 +26,7 @@
# define c3__at c3_s2('a','t') # define c3__at c3_s2('a','t')
# define c3__atom c3_s4('a','t','o','m') # define c3__atom c3_s4('a','t','o','m')
# define c3__auth c3_s4('a','u','t','h') # define c3__auth c3_s4('a','u','t','h')
# define c3__avow c3_s4('a','v','o','w')
# define c3__ax c3_s2('a','x') # define c3__ax c3_s2('a','x')
# define c3__axe c3_s3('a','x','e') # define c3__axe c3_s3('a','x','e')
# define c3__axil c3_s4('a','x','i','l') # define c3__axil c3_s4('a','x','i','l')

68
pkg/urbit/vere/io/khan.c
View File

@ -118,7 +118,7 @@ _khan_conn_cb(uv_stream_t* sem_u, c3_i tas_i)
can_u->mor_u.pok_f = _khan_moor_poke; can_u->mor_u.pok_f = _khan_moor_poke;
can_u->mor_u.bal_f = _khan_moor_bail; can_u->mor_u.bal_f = _khan_moor_bail;
// XX maybe want mug(now) or something // XX maybe want mug(now) or something
can_u->coq_l = ( san_u->can_u ) ? 1 + san_u->can_u->coq_l : 0; can_u->coq_l = ( san_u->can_u ) ? 1 + san_u->can_u->coq_l : 1;
can_u->san_u = san_u; can_u->san_u = san_u;
err_i = uv_timer_init(u3L, &can_u->mor_u.tim_u); err_i = uv_timer_init(u3L, &can_u->mor_u.tim_u);
c3_assert(!err_i); c3_assert(!err_i);
@ -234,18 +234,66 @@ _khan_io_talk(u3_auto* car_u)
_khan_born_bail); _khan_born_bail);
} }
/* _khan_search_chan(): lookup channel by connection number.
*/
static u3_chan*
_khan_search_chan(u3_khan* kan_u, c3_l sev_l, c3_l coq_l)
{
u3_chan* ret_u;
for ( ret_u = kan_u->san_u->can_u;
ret_u;
ret_u = (u3_chan*)ret_u->mor_u.nex_u ) {
if ( coq_l == ret_u->coq_l ) {
return ret_u;
}
}
return 0;
}
/* _khan_ef_handle(): handle result. /* _khan_ef_handle(): handle result.
*/ */
static void static void
_khan_ef_handle(u3_khan* kan_u, _khan_ef_handle(u3_khan* kan_u,
c3_l sev_l, c3_l sev_l,
c3_l coq_l, c3_l coq_l,
c3_l seq_l, c3_l seq_l,
u3_noun tag, u3_noun tag,
u3_noun dat) u3_noun dat)
{ {
u3l_log("khan: avow\n"); u3_chan* can_u;
// TODO handle effects
// for avow: send back over pipe as jammed noun
// for crud: send error message over pipe?
// for socket event: perform activity
if ( sev_l != kan_u->sev_l ) {
u3l_log("khan: server instance not found: %x\n", sev_l);
return;
}
if ( 0 == coq_l ) {
if ( c3y == u3r_sing_c("set-config", tag) ) {
u3l_log("khan: set-config\n");
return;
}
}
if ( 0 != (can_u = _khan_search_chan(kan_u, sev_l, coq_l)) ) {
if ( c3__avow == tag ) {
c3_y* byt_y;
c3_d len_d;
// %avow is a response; jam and send it.
//
u3s_jam_xeno(dat, &len_d, &byt_y);
u3_newt_send((u3_mojo*)&can_u->mor_u, len_d, byt_y);
}
else {
u3l_log("khan: handle-other\n");
}
}
else {
u3l_log("khan: handle-no-coq\n");
}
} }
// TODO refactor these: they are duplicated from http.c // TODO refactor these: they are duplicated from http.c
@ -303,7 +351,7 @@ _khan_io_kick(u3_auto* car_u, u3_noun wir, u3_noun cad)
u3_noun tag, dat, i_wir, t_wir; u3_noun tag, dat, i_wir, t_wir;
c3_o ret_o; c3_o ret_o;
if ( (c3n == u3r_cell(wir, &i_wir, 0)) if ( (c3n == u3r_cell(wir, &i_wir, &t_wir))
|| (c3n == u3r_cell(cad, &tag, &dat)) || (c3n == u3r_cell(cad, &tag, &dat))
|| (c3__khan != i_wir) ) || (c3__khan != i_wir) )
{ {