Merge 821bf930b0
into 122af79207
This commit is contained in:
commit
6e58367334
|
@ -150,11 +150,17 @@ route(Packet) ->
|
||||||
-spec open_session(sid(), binary(), binary(), binary(), prio(), info()) -> ok.
|
-spec open_session(sid(), binary(), binary(), binary(), prio(), info()) -> ok.
|
||||||
|
|
||||||
open_session(SID, User, Server, Resource, Priority, Info) ->
|
open_session(SID, User, Server, Resource, Priority, Info) ->
|
||||||
set_session(SID, User, Server, Resource, Priority, Info),
|
Info2 = ejabberd_hooks:run_fold(
|
||||||
|
sm_pre_register_connection_hook,
|
||||||
|
Server,
|
||||||
|
Info,
|
||||||
|
[SID, User, Server, Resource, Priority]
|
||||||
|
),
|
||||||
|
set_session(SID, User, Server, Resource, Priority, Info2),
|
||||||
check_for_sessions_to_replace(User, Server, Resource),
|
check_for_sessions_to_replace(User, Server, Resource),
|
||||||
JID = jid:make(User, Server, Resource),
|
JID = jid:make(User, Server, Resource),
|
||||||
ejabberd_hooks:run(sm_register_connection_hook,
|
ejabberd_hooks:run(sm_register_connection_hook,
|
||||||
JID#jid.lserver, [SID, JID, Info]).
|
JID#jid.lserver, [SID, JID, Info2]).
|
||||||
|
|
||||||
-spec open_session(sid(), binary(), binary(), binary(), info()) -> ok.
|
-spec open_session(sid(), binary(), binary(), binary(), info()) -> ok.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue