Merge 0.12->trunk

This commit is contained in:
Kim Alvefur 2023-05-24 15:35:28 +02:00
commit dd2e84271f
2 changed files with 6 additions and 0 deletions

View file

@ -10,5 +10,7 @@ return {
"loader";
-- "keyval+" store
"keyval+";
"s2sout-pre-connect-event";
};
};

View file

@ -226,6 +226,10 @@ function route_to_new_session(event)
resolver;
});
end
local pre_event = { session = host_session; resolver = resolver };
module:context(from_host):fire_event("s2sout-pre-connect", pre_event);
resolver = pre_event.resolver;
connect(resolver, listener, nil, { session = host_session });
m_initiated_connections:with_labels(from_host):add(1)
return true;