Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

* Added an ejabberd-1.1.4 to prepare an interim bugfix release version. 

SVN Revision: 863
This commit is contained in:
Mickaël Rémond 2007-08-09 13:04:29 +00:00
parent f3f4b5d5c8
commit 32fc9d3ce8
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/ejabberd_c2s.erl
View File

@ -95,7 +95,8 @@
%%% API
%%%----------------------------------------------------------------------
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) ->
gen_fsm:start_link(ejabberd_c2s, [SockData, Opts], ?FSMOPTS).
@ -378,10 +379,10 @@ wait_for_auth({xmlstreamelement, El}, StateData) ->
U, StateData#state.server, P,
StateData#state.streamid, D) of
true ->
?INFO_MSG(
"(~w) Accepted legacy authentication for ~s",
[StateData#state.socket,
jlib:jid_to_string(JID)]),
%%?INFO_MSG(
%% "(~w) Accepted legacy authentication for ~s",
%% [StateData#state.socket,
%% jlib:jid_to_string(JID)]),
SID = {now(), self()},
ejabberd_sm:open_session(
SID, U, StateData#state.server, R),
@ -479,8 +480,8 @@ wait_for_feature_request({xmlstreamelement, El}, StateData) ->
{xmlelement, "success",
[{"xmlns", ?NS_SASL}], []}),
U = xml:get_attr_s(username, Props),
?INFO_MSG("(~w) Accepted authentication for ~s",
[StateData#state.socket, U]),
%%?INFO_MSG("(~w) Accepted authentication for ~s",
%% [StateData#state.socket, U]),
{next_state, wait_for_stream,
StateData#state{streamid = new_id(),
authenticated = true,
@ -598,8 +599,8 @@ wait_for_sasl_response({xmlstreamelement, El}, StateData) ->
{xmlelement, "success",
[{"xmlns", ?NS_SASL}], []}),
U = xml:get_attr_s(username, Props),
?INFO_MSG("(~w) Accepted authentication for ~s",
[StateData#state.socket, U]),
%%?INFO_MSG("(~w) Accepted authentication for ~s",
%% [StateData#state.socket, U]),
{next_state, wait_for_stream,
StateData#state{streamid = new_id(),
authenticated = true,
@ -693,9 +694,9 @@ wait_for_session({xmlstreamelement, El}, StateData) ->
case acl:match_rule(StateData#state.server,
StateData#state.access, JID) of
allow ->
?INFO_MSG("(~w) Opened session for ~s",
[StateData#state.socket,
jlib:jid_to_string(JID)]),
%%?INFO_MSG("(~w) Opened session for ~s",
%% [StateData#state.socket,
%% jlib:jid_to_string(JID)]),
SID = {now(), self()},
ejabberd_sm:open_session(
SID, U, StateData#state.server, R),
@ -1158,9 +1159,9 @@ terminate(_Reason, StateName, StateData) ->
presence_broadcast(
StateData, From, StateData#state.pres_i, Packet);
_ ->
?INFO_MSG("(~w) Close session for ~s",
[StateData#state.socket,
jlib:jid_to_string(StateData#state.jid)]),
%%?INFO_MSG("(~w) Close session for ~s",
%% [StateData#state.socket,
%% jlib:jid_to_string(StateData#state.jid)]),
EmptySet = ?SETS:new(),
case StateData of

12
src/mod_muc/mod_muc_room.erl
View File

@ -87,13 +87,17 @@
%%%----------------------------------------------------------------------
start(Host, ServerHost, Access, Room, HistorySize, Creator, Nick) ->
Supervisor = gen_mod:get_module_proc(ServerHost, ejabberd_mod_muc_sup),
supervisor:start_child(
Supervisor, [Host, ServerHost, Access, Room, HistorySize, Creator, Nick]).
%%supervisor:start_child(
%% 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) ->
Supervisor = gen_mod:get_module_proc(ServerHost, ejabberd_mod_muc_sup),
supervisor:start_child(
Supervisor, [Host, ServerHost, Access, Room, HistorySize, Opts]).
%%supervisor:start_child(
%% 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) ->
gen_fsm:start_link(?MODULE, [Host, ServerHost, Access, Room, HistorySize, Creator, Nick],