summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog4
-rw-r--r--src/ejabberd.cfg8
-rw-r--r--src/mod_irc/mod_irc.erl6
-rw-r--r--src/mod_irc/mod_irc_connection.erl116
4 files changed, 101 insertions, 33 deletions
diff --git a/ChangeLog b/ChangeLog
index cb82a538..109db7eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-17 Alexey Shchepin <alexey@sevcom.net>
+
+ * src/mod_irc/: Still not completed...
+
2003-02-16 Alexey Shchepin <alexey@sevcom.net>
* src/mod_irc/: New IRC transport (not completed yet)
diff --git a/src/ejabberd.cfg b/src/ejabberd.cfg
index f910398f..f2f00b45 100644
--- a/src/ejabberd.cfg
+++ b/src/ejabberd.cfg
@@ -34,9 +34,9 @@
{normal, all}]}.
-{host, "e.localhost"}.
+{host, "localhost"}.
-{listen, [{5522, ejabberd_c2s, start, [{access, c2s},
+{listen, [{5222, ejabberd_c2s, start, [{access, c2s},
{shaper, c2s_shaper}]},
%{5523, ejabberd_c2s, start,
% [{access, c2s}, {ssl, [{certfile, "./ssl.pem"}]}]},
@@ -46,7 +46,7 @@
]}.
% This value (5569) is only for debugging, must be 5269
-{outgoing_s2s_port, 5569}.
+{outgoing_s2s_port, 5269}.
{modules, [
{mod_register, []},
@@ -56,7 +56,7 @@
{mod_stats, []},
{mod_vcard, []},
{mod_offline, []},
- {mod_echo, [{host, "echo.e.localhost"}]},
+ {mod_echo, [{host, "echo.localhost"}]},
{mod_private, []},
{mod_irc, []},
{mod_time, [{iqdisc, no_queue}]},
diff --git a/src/mod_irc/mod_irc.erl b/src/mod_irc/mod_irc.erl
index 12a540ab..d9fad181 100644
--- a/src/mod_irc/mod_irc.erl
+++ b/src/mod_irc/mod_irc.erl
@@ -12,7 +12,7 @@
-behaviour(gen_mod).
--export([start/1, init/1, stop/0]).
+-export([start/1, init/1, stop/0, closed_conection/2]).
-include("ejabberd.hrl").
@@ -91,3 +91,7 @@ do_route(Host, From, To, Packet) ->
stop() ->
ejabberd_mod_irc ! stop,
ok.
+
+closed_conection(From, Server) ->
+ ets:delete(irc_connection, {From, Server}).
+
diff --git a/src/mod_irc/mod_irc_connection.erl b/src/mod_irc/mod_irc_connection.erl
index 268572df..f147742a 100644
--- a/src/mod_irc/mod_irc_connection.erl
+++ b/src/mod_irc/mod_irc_connection.erl
@@ -29,8 +29,11 @@
-include("ejabberd.hrl").
-include("namespaces.hrl").
+-define(SETS, gb_sets).
+
-record(state, {socket, receiver, queue,
user, myname, server, nick,
+ channels = ?SETS:new(),
inbuf = "", outbuf = ""}).
-define(IRC_ENCODING, "koi8-r").
@@ -176,15 +179,24 @@ handle_info({route, Channel, Resource, {xmlelement, "presence", Attrs, Els}},
NewStateData =
case xml:get_attr_s("type", Attrs) of
"unavailable" ->
- ?SEND(io_lib:format("PART #~s\r\n", [Channel]));
+ S1 = ?SEND(io_lib:format("PART #~s\r\n", [Channel])),
+ S1#state{channels =
+ remove_element(Channel, S1#state.channels)};
"subscribe" -> StateData;
"subscribed" -> StateData;
"unsubscribe" -> StateData;
"unsubscribed" -> StateData;
_ ->
- ?SEND(io_lib:format("JOIN #~s\r\n", [Channel]))
+ S1 = ?SEND(io_lib:format("JOIN #~s\r\n", [Channel])),
+ S1#state{channels =
+ ?SETS:add_element(Channel, S1#state.channels)}
end,
- {next_state, StateName, NewStateData};
+ case ?SETS:is_empty(NewStateData#state.channels) of
+ true ->
+ {stop, normal, NewStateData};
+ _ ->
+ {next_state, StateName, NewStateData}
+ end;
handle_info({route, Channel, Resource,
{xmlelement, "message", Attrs, Els} = El},
@@ -213,33 +225,44 @@ handle_info({ircstring, [$P, $I, $N, $G, $ | ID]}, StateName, StateData) ->
handle_info({ircstring, [$: | String]}, StateName, StateData) ->
Words = string:tokens(String, " "),
- case Words of
- [_, "353" | Items] ->
- process_channel_list(StateData, Items);
- [From, "PRIVMSG", [$# | Chan] | _] ->
- process_privmsg(StateData, Chan, From, String);
- [From, "PART", [$# | Chan] | _] ->
- process_part(StateData, Chan, From, String);
- [From, "JOIN", Chan | _] ->
- process_join(StateData, Chan, From, String);
- [From, "MODE", [$# | Chan], "+o", Nick | _] ->
- process_mode_o(StateData, Chan, From, Nick,
- "admin", "moderator");
- [From, "MODE", [$# | Chan], "-o", Nick | _] ->
- process_mode_o(StateData, Chan, From, Nick,
- "member", "participant");
- _ ->
- io:format("unknown irc command '~s'~n", [String])
- end,
NewStateData =
+ case Words of
+ [_, "353" | Items] ->
+ process_channel_list(StateData, Items),
+ StateData;
+ [From, "PRIVMSG", [$# | Chan] | _] ->
+ process_privmsg(StateData, Chan, From, String),
+ StateData;
+ [From, "PART", [$# | Chan] | _] ->
+ process_part(StateData, Chan, From, String),
+ StateData;
+ [From, "JOIN", Chan | _] ->
+ process_join(StateData, Chan, From, String),
+ StateData;
+ [From, "MODE", [$# | Chan], "+o", Nick | _] ->
+ process_mode_o(StateData, Chan, From, Nick,
+ "admin", "moderator"),
+ StateData;
+ [From, "MODE", [$# | Chan], "-o", Nick | _] ->
+ process_mode_o(StateData, Chan, From, Nick,
+ "member", "participant"),
+ StateData;
+ [From, "KICK", [$# | Chan], Nick | _] ->
+ process_kick(StateData, Chan, From, Nick),
+ StateData;
+ _ ->
+ io:format("unknown irc command '~s'~n", [String]),
+ StateData
+ end,
+ NewStateData1 =
case StateData#state.outbuf of
"" ->
- StateData;
+ NewStateData;
Data ->
- send_text(StateData#state.socket, Data),
- StateData#state{outbuf = ""}
+ send_text(NewStateData#state.socket, Data),
+ NewStateData#state{outbuf = ""}
end,
- {next_state, stream_established, NewStateData};
+ {next_state, stream_established, NewStateData1};
handle_info({ircstring, String}, StateName, StateData) ->
@@ -278,8 +301,8 @@ handle_info({tcp_error, Socket, Reason}, StateName, StateData) ->
%% Returns: any
%%----------------------------------------------------------------------
terminate(Reason, StateName, StateData) ->
- ejabberd_mod_irc ! {closed_conection, {StateData#state.user,
- StateData#state.server}},
+ mod_irc:closed_conection(StateData#state.user,
+ StateData#state.server),
case StateData#state.socket of
undefined ->
ok;
@@ -394,11 +417,27 @@ process_channel_list_user(StateData, Chan, User) ->
process_privmsg(StateData, Chan, From, String) ->
[FromUser | _] = string:tokens(From, "!"),
Msg = lists:last(string:tokens(String, ":")),
+ Msg1 = case Msg of
+ [1, $A, $C, $T, $I, $O, $N, $ | Rest] ->
+ "/me " ++ Rest;
+ _ ->
+ Msg
+ end,
+ Msg2 = lists:filter(
+ fun(C) ->
+ if (C < 32) and
+ (C /= 9) and
+ (C /= 10) and
+ (C /= 13) ->
+ false;
+ true -> true
+ end
+ end, Msg1),
ejabberd_router:route({lists:concat([Chan, "%", StateData#state.server]),
StateData#state.myname, FromUser},
StateData#state.user,
{xmlelement, "message", [{"type", "groupchat"}],
- [{xmlelement, "body", [], [{xmlcdata, Msg}]}]}).
+ [{xmlelement, "body", [], [{xmlcdata, Msg2}]}]}).
process_part(StateData, Chan, From, String) ->
[FromUser | _] = string:tokens(From, "!"),
@@ -440,4 +479,25 @@ process_mode_o(StateData, Chan, From, Nick, Affiliation, Role) ->
{"role", Role}],
[]}]}]}).
+process_kick(StateData, Chan, From, Nick) ->
+ %Msg = lists:last(string:tokens(String, ":")),
+ ejabberd_router:route({lists:concat([Chan, "%", StateData#state.server]),
+ StateData#state.myname, Nick},
+ StateData#state.user,
+ {xmlelement, "presence", [{"type", "unavailable"}],
+ [{xmlelement, "x", [{"xmlns", ?NS_MUC_USER}],
+ [{xmlelement, "item",
+ [{"affiliation", "none"},
+ {"role", "none"}],
+ []},
+ {xmlelement, "status", [{"code", "307"}], []}
+ ]}]}).
+
+remove_element(E, Set) ->
+ case ?SETS:is_element(E, Set) of
+ true ->
+ ?SETS:del_element(E, Set);
+ _ ->
+ Set
+ end.
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-08 19:49:23 +0000