MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-19 00:10:59 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:vm: Add opts to pass user_id/node_id of evaluator.

Browse source
This commit is contained in:
Jason Volk 2019-04-22 12:25:50 -07:00
parent b683f1d436
commit 56dd0ed8e7
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -137,6 +137,12 @@ enum ircd::m::vm::fault
/// Evaluation Options /// Evaluation Options
struct ircd::m::vm::opts struct ircd::m::vm::opts
{ {
/// The remote server name which is conducting this eval.
string_view node_id;
/// The mxid of the user which is conducting this eval.
string_view user_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/invite.cc
View file

@ -141,7 +141,7 @@ put__invite(client &client,
// also try to sync the room as best as possible. The invitee will then be // also try to sync the room as best as possible. The invitee will then be
// presented with this invite request in their rooms list. // presented with this invite request in their rooms list.
m::vm::opts vmopts; m::vm::opts vmopts;
vmopts.prev_check_exists = false; vmopts.node_id = request.origin;
// We don't want this eval throwing an exception because the response has // We don't want this eval throwing an exception because the response has
// already been made for this request. // already been made for this request.

2
modules/federation/send.cc
View file

@ -47,6 +47,7 @@ handle_edu(client &client,
json::get<"depth"_>(event) = json::undefined_number; json::get<"depth"_>(event) = json::undefined_number;
m::vm::opts vmopts; m::vm::opts vmopts;
vmopts.node_id = request.origin;
vmopts.notify_clients = false; vmopts.notify_clients = false;
vmopts.notify_servers = false; vmopts.notify_servers = false;
vmopts.non_conform.set(m::event::conforms::INVALID_OR_MISSING_EVENT_ID); vmopts.non_conform.set(m::event::conforms::INVALID_OR_MISSING_EVENT_ID);
@ -71,6 +72,7 @@ handle_pdus(client &client,
const json::array &pdus) const json::array &pdus)
{ {
m::vm::opts vmopts; m::vm::opts vmopts;
vmopts.node_id = request.origin;
vmopts.non_conform.set(m::event::conforms::MISSING_PREV_STATE); vmopts.non_conform.set(m::event::conforms::MISSING_PREV_STATE);
vmopts.nothrows = -1U; vmopts.nothrows = -1U;
vmopts.infolog_accept = true; vmopts.infolog_accept = true;