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

* src/ejabberd_s2s_in.erl: Bugfix

Browse Source 
SVN Revision: 94
This commit is contained in:
Alexey Shchepin 2003-03-27 15:28:47 +00:00
parent 0b865c3dc4
commit 27b0a72c6f
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2003-03-27 Alexey Shchepin <alexey@sevcom.net>
* src/ejabberd_s2s_in.erl: Bugfix
* src/mod_muc/: Small fixes in discovering
2003-03-26 Alexey Shchepin <alexey@sevcom.net>

18
src/ejabberd_s2s_in.erl
View File

@ -109,7 +109,6 @@ wait_for_stream({xmlstreamstart, Name, Attrs}, StateData) ->
send_text(StateData#state.socket, ?INVALID_DOMAIN_ERR),
{stop, normal, StateData}
end;
_ ->
send_text(StateData#state.socket, ?INVALID_HEADER_ERR),
{stop, normal, StateData}
@ -123,11 +122,18 @@ wait_for_key({xmlstreamelement, El}, StateData) ->
case is_key_packet(El) of
{key, To, From, Id, Key} ->
io:format("GET KEY: ~p~n", [{To, From, Id, Key}]),
ejabberd_s2s_out:start(StateData#state.myname, From,
{verify, self(), Key}),
{next_state,
wait_for_verification,
StateData#state{server = From}};
case lists:member(To, ejabberd_router:dirty_get_all_domains()) of
true ->
ejabberd_s2s_out:start(To, From,
{verify, self(), Key}),
{next_state,
wait_for_verification,
StateData#state{myname = To,
server = From}};
_ ->
send_text(StateData#state.socket, ?INVALID_DOMAIN_ERR),
{stop, normal, StateData}
end;
{verify, To, From, Id, Key} ->
io:format("VERIFY KEY: ~p~n", [{To, From, Id, Key}]),
Key1 = ejabberd_s2s:get_key({StateData#state.myname, From}),