25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-22 16:20:52 +01:00

Send features after negotiating binding and session (EJAB-1058)

SVN Revision: 2835
This commit is contained in:
Badlop 2009-12-28 20:10:18 +00:00
parent 857c87499a
commit a7bd529dac

View File

@ -724,6 +724,13 @@ wait_for_bind({xmlstreamelement, El}, StateData) ->
Resource -> Resource ->
Resource Resource
end, end,
ServerB = StateData#state.server,
RosterVersioningFeature =
ejabberd_hooks:run_fold(roster_get_versioning_feature,
ServerB, [], [ServerB]),
send_element(StateData,
exmpp_stream:features([exmpp_server_session:feature()
| RosterVersioningFeature])),
JID = exmpp_jid:make(StateData#state.user, StateData#state.server, R), JID = exmpp_jid:make(StateData#state.user, StateData#state.server, R),
Res = exmpp_server_binding:bind(El, JID), Res = exmpp_server_binding:bind(El, JID),
send_element(StateData, Res), send_element(StateData, Res),
@ -766,6 +773,7 @@ wait_for_session({xmlstreamelement, El}, StateData) ->
?INFO_MSG("(~w) Opened session for ~s", ?INFO_MSG("(~w) Opened session for ~s",
[StateData#state.socket, [StateData#state.socket,
exmpp_jid:to_binary(JID)]), exmpp_jid:to_binary(JID)]),
send_element(StateData, exmpp_stream:features([])),
SID = {now(), self()}, SID = {now(), self()},
Conn = get_conn_type(StateData), Conn = get_conn_type(StateData),
Info = [{ip, StateData#state.ip}, {conn, Conn}, Info = [{ip, StateData#state.ip}, {conn, Conn},