Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-30 16:36:29 +01:00
Code Releases Activity

Add support for serving a Unique Room Name (thanks to Pablo Polvorin)(EJAB-1121)

Browse Source 
SVN Revision: 2803
This commit is contained in:
Badlop 2009-12-11 12:32:40 +00:00
parent 514d5aab14
commit 9ccdcfc849
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/mod_muc/mod_muc.erl
View File

@ -403,6 +403,12 @@ do_route1(Host, ServerHost, Access, HistorySize, RoomShaper,
ejabberd_router:route(To, ejabberd_router:route(To,
From, From,
exmpp_iq:iq_to_xmlel(Res)); exmpp_iq:iq_to_xmlel(Res));
#iq{type = get,
ns = ?NS_MUC_UNIQUE} = IQ ->
Res = exmpp_iq:result(IQ, iq_get_unique_el(From)),
ejabberd_router:route(To,
From,
exmpp_iq:iq_to_xmlel(Res));
#iq{} = IQ -> #iq{} = IQ ->
Err = exmpp_iq:error(IQ,'feature-not-implemented'), Err = exmpp_iq:error(IQ,'feature-not-implemented'),
ejabberd_router:route(To, From, Err); ejabberd_router:route(To, From, Err);
@ -568,6 +574,9 @@ iq_disco_info(Lang) ->
#xmlel{ns = ?NS_DISCO_INFO, name = 'feature', attrs = #xmlel{ns = ?NS_DISCO_INFO, name = 'feature', attrs =
[?XMLATTR('var', [?XMLATTR('var',
?NS_MUC_s)]}, ?NS_MUC_s)]},
#xmlel{ns = ?NS_DISCO_INFO, name = 'feature', attrs =
[?XMLATTR('var',
?NS_MUC_UNIQUE_s)]},
#xmlel{ns = ?NS_DISCO_INFO, name = 'feature', attrs = #xmlel{ns = ?NS_DISCO_INFO, name = 'feature', attrs =
[?XMLATTR('var', [?XMLATTR('var',
?NS_INBAND_REGISTER_s)]}, ?NS_INBAND_REGISTER_s)]},
@ -804,6 +813,19 @@ iq_get_vcard(Lang) ->
translate:translate(Lang, "ejabberd MUC module") ++ translate:translate(Lang, "ejabberd MUC module") ++
"\nCopyright (c) 2003-2009 Alexey Shchepin"}]}]}. "\nCopyright (c) 2003-2009 Alexey Shchepin"}]}]}.
iq_get_unique_el(From) ->
#xmlel{ns = ?NS_MUC_UNIQUE, name = 'unique',
children = [#xmlcdata{cdata = iq_get_unique_name(From)}]}.
%% @doc Get a pseudo unique Room Name. The Room Name is generated as a hash of
%% the requester JID, the local time and a random salt.
%%
%% "pseudo" because we don't verify that there is not a room
%% with the returned Name already created, nor mark the generated Name
%% as "already used". But in practice, it is unique enough. See
%% http://xmpp.org/extensions/xep-0045.html#createroom-unique
iq_get_unique_name(From) ->
sha:sha(term_to_binary([From, now(), randoms:get_string()])).
broadcast_service_message(Host, Msg) -> broadcast_service_message(Host, Msg) ->
lists:foreach( lists:foreach(