aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shchepin <alexey@process-one.net>2003-01-13 20:51:17 +0000
committerAlexey Shchepin <alexey@process-one.net>2003-01-13 20:51:17 +0000
commitc4d76dec7dbec387423683b2e5a55b25af290172 (patch)
tree4ce1c210859e3ff0381d8758251365d2a9437785
parent*** empty log message *** (diff)
*** empty log message ***
SVN Revision: 38
-rw-r--r--src/ejabberd.hrl3
-rw-r--r--src/ejabberd_c2s.erl4
-rw-r--r--src/ejabberd_s2s_in.erl2
-rw-r--r--src/ejabberd_s2s_out.erl2
-rw-r--r--src/ejabberd_service.erl2
5 files changed, 9 insertions, 4 deletions
diff --git a/src/ejabberd.hrl b/src/ejabberd.hrl
index 975056593..8f480ee5e 100644
--- a/src/ejabberd.hrl
+++ b/src/ejabberd.hrl
@@ -6,7 +6,8 @@
%%% Id : $Id$
%%%----------------------------------------------------------------------
--define(ejabberd_debug, true).
+%-define(ejabberd_debug, true).
+%-define(DBGFSM, true).
-ifdef(ejabberd_debug).
-define(DEBUG(Format, Args), io:format("D(~p:~p:~p) : "++Format++"~n",
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 725390ccf..c2e75b16a 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -246,6 +246,10 @@ handle_sync_event(Event, From, StateName, StateData) ->
handle_info({send_text, Text}, StateName, StateData) ->
send_text(StateData#state.sender, Text),
{next_state, StateName, StateData};
+handle_info(replaced, StateName, StateData) ->
+ % TODO
+ %send_text(StateData#state.sender, Text),
+ {stop, normal, StateData#state{user = ""}};
handle_info({route, From, To, Packet}, StateName, StateData) ->
{xmlelement, Name, Attrs, Els} = Packet,
{FU, FS, FR} = From,
diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl
index 6b47bc56b..6f7d02007 100644
--- a/src/ejabberd_s2s_in.erl
+++ b/src/ejabberd_s2s_in.erl
@@ -29,7 +29,7 @@
-record(state, {socket, receiver, streamid,
myname, server, queue}).
--define(DBGFSM, true).
+%-define(DBGFSM, true).
-ifdef(DBGFSM).
-define(FSMOPTS, [{debug, [trace]}]).
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
index 7e889edc0..d83901b1b 100644
--- a/src/ejabberd_s2s_out.erl
+++ b/src/ejabberd_s2s_out.erl
@@ -30,7 +30,7 @@
myname, server, xmlpid, queue,
new = false, verify = false}).
--define(DBGFSM, true).
+%-define(DBGFSM, true).
-ifdef(DBGFSM).
-define(FSMOPTS, [{debug, [trace]}]).
diff --git a/src/ejabberd_service.erl b/src/ejabberd_service.erl
index ff3b4e546..e67b0ca32 100644
--- a/src/ejabberd_service.erl
+++ b/src/ejabberd_service.erl
@@ -31,7 +31,7 @@
-record(state, {socket, receiver, streamid,
host, password}).
--define(DBGFSM, true).
+%-define(DBGFSM, true).
-ifdef(DBGFSM).
-define(FSMOPTS, [{debug, [trace]}]).