diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2006-01-23 23:13:06 +0000 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2006-01-23 23:13:06 +0000 |
| commit | a4caafeb72738b1a5e33a8c019f6792c0003548a (patch) | |
| tree | f0099b5d968592879c60f133d137c529ba39f5fd /src/mod_irc | |
| parent | * src/ejabberd_receiver.erl: Added new debugging trace: It is now (diff) | |
* src/ejabberd_sm.erl: Partially rewritten to work more
efficiently and avoid race conditions
* src/ejabberd_c2s.erl: Likewise
* src/mod_irc/mod_irc_connection.erl: Cleanup
SVN Revision: 488
Diffstat (limited to 'src/mod_irc')
| -rw-r--r-- | src/mod_irc/mod_irc_connection.erl | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/src/mod_irc/mod_irc_connection.erl b/src/mod_irc/mod_irc_connection.erl index aae1decdc..8343a6f92 100644 --- a/src/mod_irc/mod_irc_connection.erl +++ b/src/mod_irc/mod_irc_connection.erl @@ -13,7 +13,7 @@ -behaviour(gen_fsm). %% External exports --export([start/5, receiver/2, route_chan/4, route_nick/3]). +-export([start/5, route_chan/4, route_nick/3]). %% gen_fsm callbacks -export([init/1, @@ -31,7 +31,7 @@ -define(SETS, gb_sets). --record(state, {socket, encoding, receiver, queue, +-record(state, {socket, encoding, queue, user, host, server, nick, channels = dict:new(), inbuf = "", outbuf = ""}). @@ -523,21 +523,6 @@ terminate(Reason, StateName, StateData) -> %%% Internal functions %%%---------------------------------------------------------------------- -receiver(Socket, C2SPid) -> - XMLStreamPid = xml_stream:start(C2SPid), - receiver(Socket, C2SPid, XMLStreamPid). - -receiver(Socket, C2SPid, XMLStreamPid) -> - case gen_tcp:recv(Socket, 0) of - {ok, Text} -> - xml_stream:send_text(XMLStreamPid, Text), - receiver(Socket, C2SPid, XMLStreamPid); - {error, Reason} -> - exit(XMLStreamPid, closed), - gen_fsm:send_event(C2SPid, closed), - ok - end. - send_text(#state{socket = Socket, encoding = Encoding}, Text) -> CText = iconv:convert("utf-8", Encoding, lists:flatten(Text)), %?DEBUG("IRC OUTu: ~s~nIRC OUTk: ~s~n", [Text, CText]), |