Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-24 16:23:40 +01:00
Code Releases Activity

If s2s fails due to namespace mismatch, show differences to help debugging the problem.

Browse Source 
SVN Revision: 2663
This commit is contained in:
Badlop 2009-10-12 22:51:53 +00:00
parent 2565a670b1
commit e5fb89731c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ejabberd_s2s_out.erl
View File

@ -285,10 +285,12 @@ wait_for_stream({xmlstreamstart, Opening}, StateData) ->
{next_state, wait_for_features, StateData, ?FSMTIMEOUT}; {next_state, wait_for_features, StateData, ?FSMTIMEOUT};
{?NS_JABBER_SERVER, false, true} when StateData#state.use_v10 -> {?NS_JABBER_SERVER, false, true} when StateData#state.use_v10 ->
{next_state, wait_for_features, StateData#state{db_enabled = false}, ?FSMTIMEOUT}; {next_state, wait_for_features, StateData#state{db_enabled = false}, ?FSMTIMEOUT};
_ -> {NSProvided, _, _} ->
send_element(StateData, exmpp_stream:error('invalid-namespace')), send_element(StateData, exmpp_stream:error('invalid-namespace')),
?INFO_MSG("Closing s2s connection: ~s -> ~s (invalid namespace)", ?INFO_MSG("Closing s2s connection: ~s -> ~s (invalid namespace)~n"
[StateData#state.myname, StateData#state.server]), "Namespace provided: ~p~nNamespace expected: ~p",
[StateData#state.myname, StateData#state.server,
NSProvided, ?NS_JABBER_SERVER]),
{stop, normal, StateData} {stop, normal, StateData}
end; end;