summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2009-08-15 21:38:48 +0000
committerBadlop <badlop@process-one.net>2009-08-15 21:38:48 +0000
commit3571ef976757af9aee5b87ac3d9177a76cc1d03e (patch)
treebdc9436520ca7bf9da94cf927aa8ac2632446110 /src
parentDon't allow room config to enable password protection with empty password (EJ... (diff)
Update Ingoing s2s connections inner state to hold domain name (thanks to Juan Pablo Carlino)(EJAB-972)
SVN Revision: 2489
Diffstat (limited to 'src')
-rw-r--r--src/ejabberd_s2s_in.erl11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl
index e25ebd98..ae6508cd 100644
--- a/src/ejabberd_s2s_in.erl
+++ b/src/ejabberd_s2s_in.erl
@@ -532,6 +532,14 @@ handle_sync_event(get_state_infos, _From, StateName, StateData) ->
catch
_:_ -> {unknown,unknown}
end,
+ Domains = case StateData#state.authenticated of
+ true ->
+ [StateData#state.auth_domain];
+ false ->
+ Connections = StateData#state.connections,
+ [D || {{D, _}, established} <-
+ dict:to_list(Connections)]
+ end,
Infos = [
{direction, in},
{statename, StateName},
@@ -543,7 +551,8 @@ handle_sync_event(get_state_infos, _From, StateName, StateData) ->
{tls_options, StateData#state.tls_options},
{authenticated, StateData#state.authenticated},
{shaper, StateData#state.shaper},
- {sockmod, SockMod}
+ {sockmod, SockMod},
+ {domains, Domains}
],
Reply = {state_infos, Infos},
{reply,Reply,StateName,StateData};