* Added an ejabberd-1.1.4 to prepare an interim bugfix release version.
SVN Revision: 863
This commit is contained in:
parent
f3f4b5d5c8
commit
32fc9d3ce8
|
@ -95,7 +95,8 @@
|
||||||
%%% API
|
%%% API
|
||||||
%%%----------------------------------------------------------------------
|
%%%----------------------------------------------------------------------
|
||||||
start(SockData, Opts) ->
|
start(SockData, Opts) ->
|
||||||
supervisor:start_child(ejabberd_c2s_sup, [SockData, Opts]).
|
%%supervisor:start_child(ejabberd_c2s_sup, [SockData, Opts]).
|
||||||
|
gen_fsm:start(ejabberd_c2s, [SockData, Opts], ?FSMOPTS).
|
||||||
|
|
||||||
start_link(SockData, Opts) ->
|
start_link(SockData, Opts) ->
|
||||||
gen_fsm:start_link(ejabberd_c2s, [SockData, Opts], ?FSMOPTS).
|
gen_fsm:start_link(ejabberd_c2s, [SockData, Opts], ?FSMOPTS).
|
||||||
|
@ -378,10 +379,10 @@ wait_for_auth({xmlstreamelement, El}, StateData) ->
|
||||||
U, StateData#state.server, P,
|
U, StateData#state.server, P,
|
||||||
StateData#state.streamid, D) of
|
StateData#state.streamid, D) of
|
||||||
true ->
|
true ->
|
||||||
?INFO_MSG(
|
%%?INFO_MSG(
|
||||||
"(~w) Accepted legacy authentication for ~s",
|
%% "(~w) Accepted legacy authentication for ~s",
|
||||||
[StateData#state.socket,
|
%% [StateData#state.socket,
|
||||||
jlib:jid_to_string(JID)]),
|
%% jlib:jid_to_string(JID)]),
|
||||||
SID = {now(), self()},
|
SID = {now(), self()},
|
||||||
ejabberd_sm:open_session(
|
ejabberd_sm:open_session(
|
||||||
SID, U, StateData#state.server, R),
|
SID, U, StateData#state.server, R),
|
||||||
|
@ -479,8 +480,8 @@ wait_for_feature_request({xmlstreamelement, El}, StateData) ->
|
||||||
{xmlelement, "success",
|
{xmlelement, "success",
|
||||||
[{"xmlns", ?NS_SASL}], []}),
|
[{"xmlns", ?NS_SASL}], []}),
|
||||||
U = xml:get_attr_s(username, Props),
|
U = xml:get_attr_s(username, Props),
|
||||||
?INFO_MSG("(~w) Accepted authentication for ~s",
|
%%?INFO_MSG("(~w) Accepted authentication for ~s",
|
||||||
[StateData#state.socket, U]),
|
%% [StateData#state.socket, U]),
|
||||||
{next_state, wait_for_stream,
|
{next_state, wait_for_stream,
|
||||||
StateData#state{streamid = new_id(),
|
StateData#state{streamid = new_id(),
|
||||||
authenticated = true,
|
authenticated = true,
|
||||||
|
@ -598,8 +599,8 @@ wait_for_sasl_response({xmlstreamelement, El}, StateData) ->
|
||||||
{xmlelement, "success",
|
{xmlelement, "success",
|
||||||
[{"xmlns", ?NS_SASL}], []}),
|
[{"xmlns", ?NS_SASL}], []}),
|
||||||
U = xml:get_attr_s(username, Props),
|
U = xml:get_attr_s(username, Props),
|
||||||
?INFO_MSG("(~w) Accepted authentication for ~s",
|
%%?INFO_MSG("(~w) Accepted authentication for ~s",
|
||||||
[StateData#state.socket, U]),
|
%% [StateData#state.socket, U]),
|
||||||
{next_state, wait_for_stream,
|
{next_state, wait_for_stream,
|
||||||
StateData#state{streamid = new_id(),
|
StateData#state{streamid = new_id(),
|
||||||
authenticated = true,
|
authenticated = true,
|
||||||
|
@ -693,9 +694,9 @@ wait_for_session({xmlstreamelement, El}, StateData) ->
|
||||||
case acl:match_rule(StateData#state.server,
|
case acl:match_rule(StateData#state.server,
|
||||||
StateData#state.access, JID) of
|
StateData#state.access, JID) of
|
||||||
allow ->
|
allow ->
|
||||||
?INFO_MSG("(~w) Opened session for ~s",
|
%%?INFO_MSG("(~w) Opened session for ~s",
|
||||||
[StateData#state.socket,
|
%% [StateData#state.socket,
|
||||||
jlib:jid_to_string(JID)]),
|
%% jlib:jid_to_string(JID)]),
|
||||||
SID = {now(), self()},
|
SID = {now(), self()},
|
||||||
ejabberd_sm:open_session(
|
ejabberd_sm:open_session(
|
||||||
SID, U, StateData#state.server, R),
|
SID, U, StateData#state.server, R),
|
||||||
|
@ -1158,9 +1159,9 @@ terminate(_Reason, StateName, StateData) ->
|
||||||
presence_broadcast(
|
presence_broadcast(
|
||||||
StateData, From, StateData#state.pres_i, Packet);
|
StateData, From, StateData#state.pres_i, Packet);
|
||||||
_ ->
|
_ ->
|
||||||
?INFO_MSG("(~w) Close session for ~s",
|
%%?INFO_MSG("(~w) Close session for ~s",
|
||||||
[StateData#state.socket,
|
%% [StateData#state.socket,
|
||||||
jlib:jid_to_string(StateData#state.jid)]),
|
%% jlib:jid_to_string(StateData#state.jid)]),
|
||||||
|
|
||||||
EmptySet = ?SETS:new(),
|
EmptySet = ?SETS:new(),
|
||||||
case StateData of
|
case StateData of
|
||||||
|
|
|
@ -87,13 +87,17 @@
|
||||||
%%%----------------------------------------------------------------------
|
%%%----------------------------------------------------------------------
|
||||||
start(Host, ServerHost, Access, Room, HistorySize, Creator, Nick) ->
|
start(Host, ServerHost, Access, Room, HistorySize, Creator, Nick) ->
|
||||||
Supervisor = gen_mod:get_module_proc(ServerHost, ejabberd_mod_muc_sup),
|
Supervisor = gen_mod:get_module_proc(ServerHost, ejabberd_mod_muc_sup),
|
||||||
supervisor:start_child(
|
%%supervisor:start_child(
|
||||||
Supervisor, [Host, ServerHost, Access, Room, HistorySize, Creator, Nick]).
|
%% Supervisor, [Host, ServerHost, Access, Room, HistorySize, Creator, Nick]).
|
||||||
|
gen_fsm:start(?MODULE, [Host, ServerHost, Access, Room, HistorySize,
|
||||||
|
Creator, Nick], ?FSMOPTS).
|
||||||
|
|
||||||
start(Host, ServerHost, Access, Room, HistorySize, Opts) ->
|
start(Host, ServerHost, Access, Room, HistorySize, Opts) ->
|
||||||
Supervisor = gen_mod:get_module_proc(ServerHost, ejabberd_mod_muc_sup),
|
Supervisor = gen_mod:get_module_proc(ServerHost, ejabberd_mod_muc_sup),
|
||||||
supervisor:start_child(
|
%%supervisor:start_child(
|
||||||
Supervisor, [Host, ServerHost, Access, Room, HistorySize, Opts]).
|
%% Supervisor, [Host, ServerHost, Access, Room, HistorySize, Opts]).
|
||||||
|
gen_fsm:start(?MODULE, [Host, ServerHost, Access, Room, HistorySize, Opts],
|
||||||
|
?FSMOPTS).
|
||||||
|
|
||||||
start_link(Host, ServerHost, Access, Room, HistorySize, Creator, Nick) ->
|
start_link(Host, ServerHost, Access, Room, HistorySize, Creator, Nick) ->
|
||||||
gen_fsm:start_link(?MODULE, [Host, ServerHost, Access, Room, HistorySize, Creator, Nick],
|
gen_fsm:start_link(?MODULE, [Host, ServerHost, Access, Room, HistorySize, Creator, Nick],
|
||||||
|
|
Loading…
Reference in New Issue