ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-22 14:21:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

khan: _khan_read_wire takes tag, rename fn

Browse Source 
- Have _khan_read_wire take a tag rather than produce it; if the tag is
  not the one passed, it assumes it knows nothing of the rest of the
  wire structure and simply returns c3n.

- rename _khan_search_chan to _khan_find_chan, the latter being more
  flwy.
This commit is contained in:
Jōshin 2021-12-24 22:29:59 +00:00
parent 3cad739fdf
commit a85dac4e65
No known key found for this signature in database
GPG Key ID: A8BE5A9A521639D0
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,10 +147,10 @@ _khan_send_noun(u3_chan* can_u, u3_noun nun)
u3_newt_send((u3_mojo*)&can_u->mor_u, len_d, byt_y); u3_newt_send((u3_mojo*)&can_u->mor_u, len_d, byt_y);
} }
/* _khan_search_chan(): lookup channel by connection number. /* _khan_find_chan(): lookup channel by connection number.
*/ */
static u3_chan* static u3_chan*
_khan_search_chan(u3_khan* kan_u, c3_l sev_l, c3_l coq_l) _khan_find_chan(u3_khan* kan_u, c3_l sev_l, c3_l coq_l)
{ {
u3_chan* ret_u; u3_chan* ret_u;
@ -164,11 +164,11 @@ _khan_search_chan(u3_khan* kan_u, c3_l sev_l, c3_l coq_l)
return 0; return 0;
} }
/* _khan_read_wire(): decompose wire into /tag/instance/connection/request /* _khan_read_wire(): check tag, decompose wire into /sev/coq/rid
*/ */
static c3_o static c3_o
_khan_read_wire(u3_noun wir, _khan_read_wire(u3_noun wir,
c3_l* tag_l, c3_l tag_l,
c3_l* sev_l, c3_l* sev_l,
c3_l* coq_l, c3_l* coq_l,
c3_l* rid_l) c3_l* rid_l)
@ -176,7 +176,7 @@ _khan_read_wire(u3_noun wir,
u3_noun i_wir, t_wir; u3_noun i_wir, t_wir;
if ( (c3n == u3r_cell(wir, &i_wir, &t_wir)) || if ( (c3n == u3r_cell(wir, &i_wir, &t_wir)) ||
(c3n == u3a_is_cat(i_wir)) ) (tag_l != i_wir) )
{ {
u3z(wir); u3z(wir);
return c3n; return c3n;
@ -216,7 +216,6 @@ _khan_read_wire(u3_noun wir,
} }
} }
} }
*tag_l = i_wir;
u3z(wir); u3z(wir);
return c3y; return c3y;
} }
@ -230,18 +229,17 @@ _khan_poke_bail(u3_ovum* egg_u, u3_noun lud)
u3_khan* kan_u = (u3_khan*)egg_u->car_u; u3_khan* kan_u = (u3_khan*)egg_u->car_u;
u3_chan* can_u; u3_chan* can_u;
u3_noun wir = egg_u->wir; u3_noun wir = egg_u->wir;
c3_l tag_l, sev_l, coq_l, rid_l; c3_l sev_l, coq_l, rid_l;
_khan_punt_goof(u3k(lud)); _khan_punt_goof(u3k(lud));
if ( (c3n == _khan_read_wire(u3k(wir), &tag_l, &sev_l, &coq_l, &rid_l)) || if ( (c3n == _khan_read_wire(u3k(wir), c3__khan, &sev_l, &coq_l, &rid_l)) ||
(c3__khan != tag_l) ||
(kan_u->sev_l != sev_l) ) (kan_u->sev_l != sev_l) )
{ {
// wtf? // wtf?
// //
return; return;
} }
can_u = _khan_search_chan(kan_u, sev_l, coq_l); can_u = _khan_find_chan(kan_u, sev_l, coq_l);
if ( can_u ) { if ( can_u ) {
_khan_send_noun(can_u, u3nt(rid_l, c3__fail, lud)); _khan_send_noun(can_u, u3nt(rid_l, c3__fail, lud));
} }
@ -581,7 +579,7 @@ _khan_ef_handle(u3_khan* kan_u,
// TODO: socket events (close connection; any others?) // TODO: socket events (close connection; any others?)
// //
if ( 0 != (can_u = _khan_search_chan(kan_u, sev_l, coq_l)) ) { if ( 0 != (can_u = _khan_find_chan(kan_u, sev_l, coq_l)) ) {
if ( c3__avow == tag ) { if ( c3__avow == tag ) {
_khan_send_noun(can_u, u3nc(rid_l, u3k(dat))); _khan_send_noun(can_u, u3nc(rid_l, u3k(dat)));
} }
@ -605,11 +603,10 @@ _khan_io_kick(u3_auto* car_u, u3_noun wir, u3_noun cad)
{ {
u3_khan* kan_u = (u3_khan*)car_u; u3_khan* kan_u = (u3_khan*)car_u;
u3_noun tag, dat; u3_noun tag, dat;
c3_l tag_l, sev_l, coq_l, rid_l; c3_l sev_l, coq_l, rid_l;
if ( (c3n == _khan_read_wire(wir, &tag_l, &sev_l, &coq_l, &rid_l)) || if ( (c3n == _khan_read_wire(wir, c3__khan, &sev_l, &coq_l, &rid_l)) ||
(c3n == u3r_cell(cad, &tag, &dat)) || (c3n == u3r_cell(cad, &tag, &dat)) ||
(c3__khan != tag_l) ||
(kan_u->sev_l != sev_l) ) (kan_u->sev_l != sev_l) )
{ {
u3z(cad); u3z(cad);