MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-29 18:22:50 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:vm: Add txnid to opts; propagate from federation send.

Browse source
This commit is contained in:
Jason Volk 2020-01-06 16:22:30 -08:00
parent 33b06a27fb
commit f952cecfbb
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/ircd/m/vm.h
View file

@ -154,6 +154,9 @@ struct ircd::m::vm::opts
/// The mxid of the user which is conducting this eval. /// The mxid of the user which is conducting this eval.
string_view user_id; string_view user_id;
/// The txnid from the node conducting the eval.
string_view txn_id;
/// Call conform hooks (detailed behavior can be tweaked below) /// Call conform hooks (detailed behavior can be tweaked below)
bool conform {true}; bool conform {true};

2
modules/federation/send.cc
View file

@ -48,6 +48,7 @@ handle_edu(client &client,
m::vm::opts vmopts; m::vm::opts vmopts;
vmopts.node_id = request.origin; vmopts.node_id = request.origin;
vmopts.txn_id = txn_id;
vmopts.edu = true; vmopts.edu = true;
vmopts.notify_clients = false; vmopts.notify_clients = false;
vmopts.notify_servers = false; vmopts.notify_servers = false;
@ -69,6 +70,7 @@ handle_pdus(client &client,
vmopts.nothrows = -1U; vmopts.nothrows = -1U;
vmopts.nothrows &= ~m::vm::fault::INTERRUPT; vmopts.nothrows &= ~m::vm::fault::INTERRUPT;
vmopts.node_id = request.origin; vmopts.node_id = request.origin;
vmopts.txn_id = txn_id;
vmopts.fetch_state = false; vmopts.fetch_state = false;
m::vm::eval eval m::vm::eval eval
{ {