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

vere: simulate successful negotation (temporary, pending arvo)

Browse Source
This commit is contained in:
Joe Bryan 2020-11-04 22:54:32 -08:00
parent 8616497c36
commit 0f11505073
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/urbit/vere/pier.c
View File

@ -557,7 +557,7 @@ _pier_work_init(u3_pier* pir_u)
/* _pier_wyrd_good(): %wyrd version negotation succeeded. /* _pier_wyrd_good(): %wyrd version negotation succeeded.
*/ */
static void static void
_pier_wyrd_good(u3_pier* pir_u, u3_ovum* egg_u, u3_gift* gif_u) _pier_wyrd_good(u3_pier* pir_u, u3_ovum* egg_u)
{ {
// restore event callbacks // restore event callbacks
// //
@ -571,10 +571,6 @@ _pier_wyrd_good(u3_pier* pir_u, u3_ovum* egg_u, u3_gift* gif_u)
// //
_pier_work_init(pir_u); _pier_work_init(pir_u);
// plan %wyrd effects
//
_pier_gift_plan(pir_u->wok_u, gif_u);
// free %wyrd driver and ovum // free %wyrd driver and ovum
// //
{ {
@ -674,7 +670,7 @@ _pier_on_lord_wyrd_done(void* ptr_v,
u3_fact_free(tac_u); u3_fact_free(tac_u);
u3_gift_free(gif_u); u3_gift_free(gif_u);
// XX messageing // XX messaging, cli argument to bypass
// //
u3l_log("pier: version negotiation failed; downgrade\n"); u3l_log("pier: version negotiation failed; downgrade\n");
_pier_wyrd_fail(pir_u, egg_u, u3_nul); _pier_wyrd_fail(pir_u, egg_u, u3_nul);
@ -686,7 +682,11 @@ _pier_on_lord_wyrd_done(void* ptr_v,
// finalize %wyrd success // finalize %wyrd success
// //
_pier_wyrd_good(pir_u, egg_u, gif_u); _pier_wyrd_good(pir_u, egg_u);
// plan %wyrd effects
//
_pier_gift_plan(pir_u->wok_u, gif_u);
} }
} }
@ -699,11 +699,22 @@ _pier_on_lord_wyrd_bail(void* ptr_v, u3_ovum* egg_u, u3_noun lud)
c3_assert( u3_psat_wyrd == pir_u->sat_e ); c3_assert( u3_psat_wyrd == pir_u->sat_e );
// XX add cli argument to bypass negotiation failure
//
#if 0
// print %wyrd failure and exit // print %wyrd failure and exit
// //
// XX check bail mote, retry on %intr, %meme, &c // XX check bail mote, retry on %intr, %meme, &c
// //
_pier_wyrd_fail(pir_u, egg_u, lud); _pier_wyrd_fail(pir_u, egg_u, lud);
#else
// XX temporary hack to fake %wyrd success
//
{
_pier_wyrd_good(pir_u, egg_u);
u3z(lud);
}
#endif
} }
/* _pier_wyrd_init(): send %wyrd. /* _pier_wyrd_init(): send %wyrd.