Skip to content

mesa: more misc bugfixes #718

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yosoyubik merged 2 commits into from
Sep 11, 2024
Merged

mesa: more misc bugfixes #718

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
765d170
mesa: use set for pit lanes
yosoyubik Sep 10, 2024
0d8eb8b
mesa: don't send auth response for single-fragment message
yosoyubik Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions pkg/vere/io/mesa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1347,7 +1347,8 @@ _mesa_send_bufs(u3_mesa* sam_u,
c3_w len_w,
u3_noun las)
{
u3_noun lan, t = las;
u3_noun lan, t = u3qdi_tap(las);

while ( t != u3_nul ) {
u3x_cell(t, &lan, &t);
u3_lane lan_u = _realise_lane(u3k(lan));
Expand All @@ -1363,7 +1364,7 @@ _mesa_send_bufs(u3_mesa* sam_u,
}
}
}
u3z(las);
u3z(las); u3z(lan);
}

static void
Expand Down Expand Up @@ -1488,13 +1489,13 @@ _mesa_queue_czar(u3_mesa* sam_u, u3_noun las, u3_noun pac)
u3_czar_info* imp_u = &sam_u->imp_u[lan];

if ( 0 != imp_u->pip_w ) {
res = u3nc(u3nt(c3__if, u3i_word(imp_u->pip_w), _ames_czar_port(lan)), res);
res = u3qdi_put(res, u3nt(c3__if, u3i_word(imp_u->pip_w), _ames_czar_port(lan)));
}
if ( c3y == u3_Host.ops_u.net ) {
_mesa_resolve_czar(sam_u, lan, u3k(pac));
}
} else {
res = u3nc(u3k(lan), res);
res = u3qdi_put(res, u3k(lan));
}
}
u3z(las);
Expand Down Expand Up @@ -1563,10 +1564,11 @@ _mesa_add_lane_to_pit(u3_mesa* sam_u, u3_mesa_name* nam_u, u3_lane lan_u)
u3_noun lan = u3_mesa_encode_lane(lan_u);
u3_weak pin = _mesa_get_pit(sam_u, nam_u);
if ( u3_none == pin ) {
pin = u3nt(c3n, u3k(lan), u3_nul);
pin = u3nc(c3n, u3nt(u3k(lan), u3_nul, u3_nul));
}
else {
pin = u3nt(u3k(u3h(pin)), u3k(lan), u3k(u3t(pin)));
pin = //u3qdi_put(pin, u3nt(u3k(u3h(pin)), u3k(lan), u3k(u3t(pin))));
u3nc(u3h(pin), u3qdi_put(u3t(pin), u3k(lan)));
}
_mesa_put_pit(sam_u, nam_u, u3k(pin));
u3z(lan); u3z(pin);
Expand Down Expand Up @@ -1916,10 +1918,10 @@ _mesa_send_leaf(u3_mesa* sam_u,

lss_pair* pair = ((lss_pair*)lin_u->haz_y) + i_d;

if ( 0 == memcmp(pair, &(lss_pair){0}, sizeof(lss_pair)) ) {
dat_u->aut_u.typ_e = AUTH_NONE;
} else if ( 0 == nam_u->fra_d ) {
if ( 0 == nam_u->fra_d ) { // XX
_mesa_copy_auth_data(&dat_u->aut_u, &lin_u->aut_u);
} else if ( 0 == memcmp(pair, &(lss_pair){0}, sizeof(lss_pair)) ) {
dat_u->aut_u.typ_e = AUTH_NONE;
}else {
dat_u->aut_u.typ_e = AUTH_PAIR;
memcpy(dat_u->aut_u.has_y, pair, sizeof(lss_pair));
Expand Down Expand Up @@ -1976,9 +1978,10 @@ _mesa_send_jumbo_pieces(u3_mesa* sam_u, u3_mesa_line* lin_u, c3_d* fra_u)
nam_u->nit_o = c3y;
u3_weak pin = _mesa_get_pit(sam_u, nam_u);
if ( u3_none != pin ) {
// XX lss_proof_size always returns >= 1
// if the initial Merkle proof is nonzero, this is a multifragment
// message; send auth response to the %init request
if ( pro_w > 0 ) {
if ( pro_w > 1 ) {
dat_u->len_w = pro_w * sizeof(lss_hash);
c3_y* pro_y = c3_malloc(dat_u->len_w);
memcpy(pro_y, lin_u->tip_y, dat_u->len_w);
Expand Down