Attachment 174451 Details for Bug 212410 – possible_patch-net_im-ejabberd

[patch] possible_patch-net_im-ejabberd

svn-diff_ejabberd (text/plain), 31.41 KB, created by Walter Schwarzenfeld on 2016-09-07 01:10:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2016-09-07 01:10:46 UTC

Size: 31.41 KB

patch

obsolete

>Index: files/patch-adhoc.erl
>===================================================================
>--- files/patch-adhoc.erl	(nonexistent)
>+++ files/patch-adhoc.erl	(working copy)
>@@ -0,0 +1,29 @@
>+--- src/adhoc.erl.orig	2016-09-07 00:57:41 UTC
>++++ src/adhoc.erl
>+@@ -41,7 +41,7 @@
>+ %% Parse an ad-hoc request.  Return either an adhoc_request record or
>+ %% an {error, ErrorType} tuple.
>+ %%
>+--spec(parse_request/1 ::
>++-spec(parse_request
>+ (
>+   IQ :: iq_request())
>+     -> adhoc_response()
>+@@ -88,7 +88,7 @@ find_xdata_el1([_ | Els]) -> find_xdata_
>+ %% record, filling in values for language, node and session id from
>+ %% the request.
>+ %%
>+--spec(produce_response/2 ::
>++-spec(produce_response
>+ (
>+   Adhoc_Request  :: adhoc_request(),
>+   Adhoc_Response :: adhoc_response())
>+@@ -104,7 +104,7 @@ produce_response(#adhoc_request{lang = L
>+     }).
>+ 
>+ %%
>+--spec(produce_response/1 ::
>++-spec(produce_response
>+ (
>+   Adhoc_Response::adhoc_response())
>+     -> Xmlel::xmlel()
>
>Property changes on: files/patch-adhoc.erl
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-cyrsasl.erl
>===================================================================
>--- files/patch-cyrsasl.erl	(nonexistent)
>+++ files/patch-cyrsasl.erl	(working copy)
>@@ -0,0 +1,38 @@
>+--- src/cyrsasl.erl.orig	2016-09-07 00:20:18 UTC
>++++ src/cyrsasl.erl
>+@@ -88,7 +88,7 @@ start() ->
>+     ok.
>+ 
>+ %%
>+--spec(register_mechanism/3 ::
>++-spec(register_mechanism
>+ (
>+   Mechanim     :: mechanism(),
>+   Module       :: module(),
>+@@ -139,7 +139,7 @@ check_credentials(_State, Props) ->
>+       _LUser -> ok
>+     end.
>+ 
>+--spec(listmech/1 ::
>++-spec(listmech
>+ (
>+   Host ::binary())
>+     -> Mechanisms::mechanisms()
>+@@ -213,7 +213,7 @@ server_step(State, ClientIn) ->
>+ %% Remove the anonymous mechanism from the list if not enabled for the given
>+ %% host
>+ %%
>+--spec(filter_anonymous/2 ::
>++-spec(filter_anonymous
>+ (
>+   Host  :: binary(),
>+   Mechs :: mechanisms())
>+@@ -226,7 +226,7 @@ filter_anonymous(Host, Mechs) ->
>+       false -> Mechs -- [<<"ANONYMOUS">>]
>+     end.
>+ 
>+--spec(is_disabled/1 ::
>++-spec(is_disabled
>+ (
>+   Mechanism :: mechanism())
>+     -> boolean()
>
>Property changes on: files/patch-cyrsasl.erl
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-ejabberd__config.erl
>===================================================================
>--- files/patch-ejabberd__config.erl	(nonexistent)
>+++ files/patch-ejabberd__config.erl	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/ejabberd_config.erl.orig	2016-09-07 00:23:10 UTC
>++++ src/ejabberd_config.erl
>+@@ -90,7 +90,7 @@ hosts_to_start(State) ->
>+ 
>+ %% @private
>+ %% At the moment, these functions are mainly used to setup unit tests.
>+--spec(start/2 :: (Hosts :: [binary()], Opts :: [acl:acl() | local_config()]) -> ok).
>++-spec(start (Hosts :: [binary()], Opts :: [acl:acl() | local_config()]) -> ok).
>+ start(Hosts, Opts) ->
>+     mnesia_init(),
>+     set_opts(set_hosts_in_options(Hosts, #state{opts = Opts})).
>
>Property changes on: files/patch-ejabberd__config.erl
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-fxml.erl
>===================================================================
>--- files/patch-fxml.erl	(nonexistent)
>+++ files/patch-fxml.erl	(working copy)
>@@ -0,0 +1,209 @@
>+--- deps/fast_xml/src/fxml.erl.orig	2016-09-06 16:17:10 UTC
>++++ deps/fast_xml/src/fxml.erl 
>+@@ -48,7 +48,7 @@ load_nif() ->
>+     end.
>+ 
>+ %%
>+--spec(element_to_binary/1 ::
>++-spec(element_to_binary
>+ (
>+   El :: xmlel() | cdata())
>+     -> binary()
>+@@ -69,7 +69,7 @@ crypt(S) ->
>+        || <<C>> <= S >>.
>+ 
>+ %%
>+--spec(remove_cdata_p/1 ::
>++-spec(remove_cdata_p
>+ (
>+   El :: xmlel() | cdata())
>+     -> boolean()
>+@@ -79,7 +79,7 @@ remove_cdata_p(#xmlel{}) -> true;
>+ remove_cdata_p(_) -> false.
>+ 
>+ %%
>+--spec(remove_cdata/1 ::
>++-spec(remove_cdata
>+ (
>+   L :: [xmlel() | cdata()])
>+     -> [xmlel()]
>+@@ -90,7 +90,7 @@ remove_cdata(L) -> [E || E <- L, remove_
>+ %% This function is intended to remove subtags based on a name and an
>+ %% attribute, usually an xmlns attribute for a specific XMPP
>+ %% extension.
>+--spec(remove_subtags/3 ::
>++-spec(remove_subtags
>+ (
>+   Xmlel :: xmlel(),
>+   Name  :: binary(),
>+@@ -104,7 +104,7 @@ remove_subtags(#xmlel{name = TagName, at
>+         children = remove_subtags1(Els, [], Name, Attr)}.
>+ 
>+ %%
>+--spec(remove_subtags1/4 ::
>++-spec(remove_subtags1
>+ (
>+   Els    :: [xmlel() | cdata()],
>+   NewEls :: [xmlel()],
>+@@ -129,7 +129,7 @@ remove_subtags1([El | Els], NewEls, Name
>+       _ -> remove_subtags1(Els, [El | NewEls], Name, Attr)
>+     end.
>+ 
>+--spec(get_cdata/1 ::
>++-spec(get_cdata
>+ (
>+   L :: [xmlel() | cdata()])
>+     -> binary()
>+@@ -138,7 +138,7 @@ remove_subtags1([El | Els], NewEls, Name
>+ get_cdata(L) ->
>+     (iolist_to_binary(get_cdata(L, <<"">>))).
>+ 
>+--spec(get_cdata/2 ::
>++-spec(get_cdata
>+ (
>+   L :: [xmlel() | cdata()],
>+   S :: binary() | iolist())
>+@@ -150,7 +150,7 @@ get_cdata([{xmlcdata, CData} | L], S) ->
>+ get_cdata([_ | L], S) -> get_cdata(L, S);
>+ get_cdata([], S) -> S.
>+ 
>+--spec(get_tag_cdata/1 ::
>++-spec(get_tag_cdata
>+ (
>+   Xmlel :: xmlel())
>+     -> binary()
>+@@ -159,7 +159,7 @@ get_cdata([], S) -> S.
>+ get_tag_cdata(#xmlel{children = Els}) -> get_cdata(Els).
>+ 
>+ %%
>+--spec(get_attr/2 ::
>++-spec(get_attr
>+ (
>+   AttrName :: binary(),
>+   Attrs    :: [attr()])
>+@@ -174,7 +174,7 @@ get_attr(AttrName, Attrs) ->
>+     end.
>+ 
>+ %%
>+--spec(get_attr_s/2 ::
>++-spec(get_attr_s
>+ (
>+   AttrName :: binary(),
>+   Attrs    :: [attr()])
>+@@ -188,7 +188,7 @@ get_attr_s(AttrName, Attrs) ->
>+     end.
>+ 
>+ %%
>+--spec(get_tag_attr/2 ::
>++-spec(get_tag_attr
>+ (
>+   AttrName :: binary(),
>+   Xmlel    :: xmlel())
>+@@ -200,7 +200,7 @@ get_tag_attr(AttrName, #xmlel{attrs = At
>+     get_attr(AttrName, Attrs).
>+ 
>+ %%
>+--spec(get_tag_attr_s/2 ::
>++-spec(get_tag_attr_s
>+ (
>+   AttrName :: binary(),
>+   Xmlel    :: xmlel())
>+@@ -211,7 +211,7 @@ get_tag_attr_s(AttrName, #xmlel{attrs = 
>+     get_attr_s(AttrName, Attrs).
>+ 
>+ %%
>+--spec(get_subtag/2 ::
>++-spec(get_subtag
>+ (
>+   Xmlel :: xmlel(),
>+   Name  :: binary())
>+@@ -222,7 +222,7 @@ get_subtag(#xmlel{children = Els}, Name)
>+     get_subtag1(Els, Name).
>+ 
>+ %%
>+--spec(get_subtag1/2 ::
>++-spec(get_subtag1
>+ (
>+   Els  :: [xmlel() | cdata()],
>+   Name :: binary())
>+@@ -236,7 +236,7 @@ get_subtag1( [El | Els], Name) ->
>+     end;
>+ get_subtag1([], _) -> false.
>+ 
>+--spec(get_subtags/2 ::
>++-spec(get_subtags
>+ (
>+   Xmlel :: xmlel(),
>+   Name  :: binary())
>+@@ -255,7 +255,7 @@ get_subtags1([El | Els], Name, Acc) ->
>+     end.
>+ 
>+ %%
>+--spec(get_subtag_with_xmlns/3 ::
>++-spec(get_subtag_with_xmlns
>+ (
>+   Xmlel :: xmlel(),
>+   Name  :: binary(),
>+@@ -267,7 +267,7 @@ get_subtag_with_xmlns(#xmlel{children = 
>+     get_subtag_with_xmlns1(Els, Name, XMLNS).
>+ 
>+ %%
>+--spec(get_subtag_with_xmlns1/3 ::
>++-spec(get_subtag_with_xmlns1
>+ (
>+   Els  :: [xmlel() | cdata()],
>+   Name :: binary(),
>+@@ -290,7 +290,7 @@ get_subtag_with_xmlns1([El | Els], Name,
>+ get_subtag_with_xmlns1([], _, _) ->
>+     false.
>+ 
>+--spec(get_subtags_with_xmlns/3 ::
>++-spec(get_subtags_with_xmlns
>+ (
>+   Xmlel :: xmlel(),
>+   Name  :: binary(),
>+@@ -317,7 +317,7 @@ get_subtags_with_xmlns1([El | Els], Name
>+     end.
>+ 
>+ %%
>+--spec(get_subtag_cdata/2 ::
>++-spec(get_subtag_cdata
>+ (
>+   Tag  :: xmlel(),
>+   Name :: binary())
>+@@ -331,7 +331,7 @@ get_subtag_cdata(Tag, Name) ->
>+     end.
>+ 
>+ %%
>+--spec(append_subtags/2 ::
>++-spec(append_subtags
>+ (
>+   Xmlel    :: xmlel(),
>+   SubTags2 :: [xmlel() | cdata()])
>+@@ -342,7 +342,7 @@ append_subtags(#xmlel{name = Name, attrs
>+     #xmlel{name = Name, attrs = Attrs, children = SubTags1 ++ SubTags2}.
>+ 
>+ %%
>+--spec(get_path_s/2 ::
>++-spec(get_path_s
>+ (
>+   El   :: xmlel(),
>+   Path :: [{elem, Name::binary()}
>+@@ -363,7 +363,7 @@ get_path_s(El, [{attr, Name}]) ->
>+ get_path_s(El, [cdata]) -> get_tag_cdata(El).
>+ 
>+ %%
>+--spec(replace_tag_attr/3 ::
>++-spec(replace_tag_attr
>+ (
>+   Name  :: binary(),
>+   Value :: binary(),
>+@@ -381,7 +381,7 @@ replace_tag_attr(Name, Value, Xmlel) ->
>+     }.
>+ 
>+ 
>+--spec(replace_subtag/2 ::
>++-spec(replace_subtag
>+ (
>+   Tag   :: xmlel(),
>+   Xmlel :: xmlel())
>
>Property changes on: files/patch-fxml.erl
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-jlib.erl
>===================================================================
>--- files/patch-jlib.erl	(nonexistent)
>+++ files/patch-jlib.erl	(working copy)
>@@ -0,0 +1,56 @@
>+--- src/jlib.erl.orig	2016-09-07 00:53:26 UTC
>++++ src/jlib.erl
>+@@ -306,7 +306,7 @@ get_iq_namespace(#xmlel{name = <<"iq">>,
>+ get_iq_namespace(_) -> <<"">>.
>+ 
>+ %%
>+--spec(iq_query_info/1 ::
>++-spec(iq_query_info
>+ (
>+   Xmlel :: xmlel())
>+     -> iq_request() | 'reply' | 'invalid' | 'not_iq'
>+@@ -316,7 +316,7 @@ get_iq_namespace(_) -> <<"">>.
>+ iq_query_info(El) -> iq_info_internal(El, request).
>+ 
>+ %%
>+--spec(iq_query_or_response_info/1 ::
>++-spec(iq_query_or_response_info
>+ (
>+   Xmlel :: xmlel())
>+     -> iq_request() | iq_reply() | 'reply' | 'invalid' | 'not_iq'
>+@@ -372,7 +372,7 @@ iq_type_to_string(get) -> <<"get">>;
>+ iq_type_to_string(result) -> <<"result">>;
>+ iq_type_to_string(error) -> <<"error">>.
>+ 
>+--spec(iq_to_xml/1 ::
>++-spec(iq_to_xml
>+ (
>+   IQ :: iq())
>+     -> xmlel()
>+@@ -390,7 +390,7 @@ iq_to_xml(#iq{id = ID, type = Type, sub_
>+ 		  children = SubEl}
>+     end.
>+ 
>+--spec(parse_xdata_submit/1 ::
>++-spec(parse_xdata_submit
>+ (
>+   El :: xmlel())
>+     -> [{Var::binary(), Values::[binary()]}]
>+@@ -408,7 +408,7 @@ parse_xdata_submit(#xmlel{attrs = Attrs,
>+             invalid
>+     end.
>+ 
>+--spec(parse_xdata_fields/2 ::
>++-spec(parse_xdata_fields
>+ (
>+   Xmlels :: [xmlel() | cdata()],
>+   Res    :: [{Var::binary(), Values :: [binary()]}])
>+@@ -428,7 +428,7 @@ parse_xdata_fields([#xmlel{name = <<"fie
>+ parse_xdata_fields([_ | Els], Res) ->
>+     parse_xdata_fields(Els, Res).
>+ 
>+--spec(parse_xdata_values/2 ::
>++-spec(parse_xdata_values
>+ (
>+   Xmlels :: [xmlel() | cdata()],
>+   Res    :: [binary()])
>
>Property changes on: files/patch-jlib.erl
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-lager__transform.erl
>===================================================================
>--- files/patch-lager__transform.erl	(nonexistent)
>+++ files/patch-lager__transform.erl	(working copy)
>@@ -0,0 +1,25 @@
>+--- deps/lager/src/lager_transform.erl.orig	2016-09-07 00:14:25 UTC
>++++ deps/lager/src/lager_transform.erl
>+@@ -59,15 +59,17 @@ walk_ast(Acc, [{function, Line, Name, Ar
>+     walk_ast([{function, Line, Name, Arity,
>+                 walk_clauses([], Clauses)}|Acc], T);
>+ walk_ast(Acc, [{attribute, _, record, {Name, Fields}}=H|T]) ->
>+-    FieldNames = lists:map(fun({record_field, _, {atom, _, FieldName}}) ->
>+-                FieldName;
>+-            ({record_field, _, {atom, _, FieldName}, _Default}) ->
>+-                FieldName
>+-        end, Fields),
>++FieldNames = lists:map(fun record_field_name/1, Fields),
>+     stash_record({Name, FieldNames}),
>+     walk_ast([H|Acc], T);
>+ walk_ast(Acc, [H|T]) ->
>+     walk_ast([H|Acc], T).
>++record_field_name({record_field, _, {atom, _, FieldName}}) ->
>++    FieldName;
>++record_field_name({record_field, _, {atom, _, FieldName}, _Default}) ->
>++    FieldName;
>++record_field_name({typed_record_field, Field, _Type}) ->
>++    record_field_name(Field).
>+ 
>+ walk_clauses(Acc, []) ->
>+     lists:reverse(Acc);
>
>Property changes on: files/patch-lager__transform.erl
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-mod__pubsub.erl
>===================================================================
>--- files/patch-mod__pubsub.erl	(nonexistent)
>+++ files/patch-mod__pubsub.erl	(working copy)
>@@ -0,0 +1,317 @@
>+--- src/mod_pubsub.erl.orig	2016-09-07 00:45:01 UTC
>++++ src/mod_pubsub.erl
>+@@ -232,7 +232,7 @@ stop(Host) ->
>+ %%                         {stop, Reason}
>+ %% Description: Initiates the server
>+ %%--------------------------------------------------------------------
>+--spec(init/1 ::
>++-spec(init
>+     (
>+ 	[binary() | [{_,_}],...])
>+     -> {'ok',state()}
>+@@ -478,7 +478,7 @@ send_loop(State) ->
>+ %% disco hooks handling functions
>+ %%
>+ 
>+--spec(disco_local_identity/5 ::
>++-spec(disco_local_identity
>+     (
>+ 	Acc    :: [xmlel()],
>+ 	_From  :: jid(),
>+@@ -500,7 +500,7 @@ disco_local_identity(Acc, _From, To, <<>
>+ disco_local_identity(Acc, _From, _To, _Node, _Lang) ->
>+     Acc.
>+ 
>+--spec(disco_local_features/5 ::
>++-spec(disco_local_features
>+     (
>+ 	Acc    :: [xmlel()],
>+ 	_From  :: jid(),
>+@@ -526,7 +526,7 @@ disco_local_items(Acc, _From, _To, _Node
>+ %    when is_binary(Node) ->
>+ %    disco_sm_identity(Acc, From, To, iolist_to_binary(Node),
>+ %                      Lang);
>+--spec(disco_sm_identity/5 ::
>++-spec(disco_sm_identity
>+     (
>+ 	Acc  :: empty | [xmlel()],
>+ 	From :: jid(),
>+@@ -569,7 +569,7 @@ disco_identity(Host, Node, From) ->
>+ 	_ -> []
>+     end.
>+ 
>+--spec(disco_sm_features/5 ::
>++-spec(disco_sm_features
>+     (
>+ 	Acc  :: empty | {result, Features::[Feature::binary()]},
>+ 	From :: jid(),
>+@@ -605,7 +605,7 @@ disco_features(Host, Node, From) ->
>+ 	_ -> []
>+     end.
>+ 
>+--spec(disco_sm_items/5 ::
>++-spec(disco_sm_items
>+     (
>+ 	Acc  :: empty | {result, [xmlel()]},
>+ 	From :: jid(),
>+@@ -625,7 +625,7 @@ disco_sm_items({result, OtherItems}, Fro
>+ 	    disco_items(jid:tolower(jid:remove_resource(To)), Node, From))};
>+ disco_sm_items(Acc, _From, _To, _Node, _Lang) -> Acc.
>+ 
>+--spec(disco_items/3 ::
>++-spec(disco_items
>+     (
>+ 	Host :: mod_pubsub:host(),
>+ 	Node :: mod_pubsub:nodeId(),
>+@@ -845,7 +845,7 @@ handle_call(stop, _From, State) ->
>+ %% @private
>+ handle_cast(_Msg, State) -> {noreply, State}.
>+ 
>+--spec(handle_info/2 ::
>++-spec(handle_info
>+     (
>+ 	_     :: {route, From::jid(), To::jid(), Packet::xmlel()},
>+ 	State :: state())
>+@@ -933,7 +933,7 @@ terminate(_Reason,
>+ %% @private
>+ code_change(_OldVsn, State, _Extra) -> {ok, State}.
>+ 
>+--spec(do_route/7 ::
>++-spec(do_route
>+     (
>+ 	ServerHost :: binary(),
>+ 	Access     :: atom(),
>+@@ -1130,7 +1130,7 @@ iq_disco_info(Host, SNode, From, Lang) -
>+ 	    node_disco_info(Host, Node, From)
>+     end.
>+ 
>+--spec(iq_disco_items/4 ::
>++-spec(iq_disco_items
>+     (
>+ 	Host   :: mod_pubsub:host(),
>+ 	Node   :: <<>> | mod_pubsub:nodeId(),
>+@@ -1200,7 +1200,7 @@ iq_disco_items(Host, Item, From, RSM) ->
>+ 	    end
>+     end.
>+ 
>+--spec(iq_sm/3 ::
>++-spec(iq_sm
>+     (
>+ 	From :: jid(),
>+ 	To   :: jid(),
>+@@ -1231,7 +1231,7 @@ iq_get_vcard(Lang) ->
>+ 		    <<(translate:translate(Lang, <<"ejabberd Publish-Subscribe module">>))/binary,
>+ 			"\nCopyright (c) 2004-2016 ProcessOne">>}]}].
>+ 
>+--spec(iq_pubsub/6 ::
>++-spec(iq_pubsub
>+     (
>+ 	Host       :: mod_pubsub:host(),
>+ 	ServerHost :: binary(),
>+@@ -1247,7 +1247,7 @@ iq_get_vcard(Lang) ->
>+ iq_pubsub(Host, ServerHost, From, IQType, SubEl, Lang) ->
>+     iq_pubsub(Host, ServerHost, From, IQType, SubEl, Lang, all, plugins(Host)).
>+ 
>+--spec(iq_pubsub/8 ::
>++-spec(iq_pubsub
>+     (
>+ 	Host       :: mod_pubsub:host(),
>+ 	ServerHost :: binary(),
>+@@ -1357,7 +1357,7 @@ iq_pubsub(Host, ServerHost, From, IQType
>+     end.
>+ 
>+ 
>+--spec(iq_pubsub_owner/6 ::
>++-spec(iq_pubsub_owner
>+     (
>+ 	Host       :: mod_pubsub:host(),
>+ 	ServerHost :: binary(),
>+@@ -1791,7 +1791,7 @@ update_auth(Host, Node, Type, Nidx, Subs
>+ %%<li>nodetree create_node checks if nodeid already exists</li>
>+ %%<li>node plugin create_node just sets default affiliation/subscription</li>
>+ %%</ul>
>+--spec(create_node/5 ::
>++-spec(create_node
>+     (
>+ 	Host          :: mod_pubsub:host(),
>+ 	ServerHost    :: binary(),
>+@@ -1805,7 +1805,7 @@ update_auth(Host, Node, Type, Nidx, Subs
>+ create_node(Host, ServerHost, Node, Owner, Type) ->
>+     create_node(Host, ServerHost, Node, Owner, Type, all, []).
>+ 
>+--spec(create_node/7 ::
>++-spec(create_node
>+     (
>+ 	Host          :: mod_pubsub:host(),
>+ 	ServerHost    :: binary(),
>+@@ -1931,7 +1931,7 @@ create_node(Host, ServerHost, Node, Owne
>+ %%<li>The node is the root collection node, which cannot be deleted.</li>
>+ %%<li>The specified node does not exist.</li>
>+ %%</ul>
>+--spec(delete_node/3 ::
>++-spec(delete_node
>+     (
>+ 	Host  :: mod_pubsub:host(),
>+ 	Node  :: mod_pubsub:nodeId(),
>+@@ -2015,7 +2015,7 @@ delete_node(Host, Node, Owner) ->
>+ %%<li>The node does not support subscriptions.</li>
>+ %%<li>The node does not exist.</li>
>+ %%</ul>
>+--spec(subscribe_node/5 ::
>++-spec(subscribe_node
>+     (
>+ 	Host          :: mod_pubsub:host(),
>+ 	Node          :: mod_pubsub:nodeId(),
>+@@ -2134,7 +2134,7 @@ subscribe_node(Host, Node, From, JID, Co
>+ %%<li>The node does not exist.</li>
>+ %%<li>The request specifies a subscription ID that is not valid or current.</li>
>+ %%</ul>
>+--spec(unsubscribe_node/5 ::
>++-spec(unsubscribe_node
>+     (
>+ 	Host  :: mod_pubsub:host(),
>+ 	Node  :: mod_pubsub:nodeId(),
>+@@ -2172,7 +2172,7 @@ unsubscribe_node(Host, Node, From, Subsc
>+ %%<li>The item contains more than one payload element or the namespace of the root payload element does not match the configured namespace for the node.</li>
>+ %%<li>The request does not match the node configuration.</li>
>+ %%</ul>
>+--spec(publish_item/6 ::
>++-spec(publish_item
>+     (
>+ 	Host       :: mod_pubsub:host(),
>+ 	ServerHost :: binary(),
>+@@ -2307,7 +2307,7 @@ publish_item(Host, ServerHost, Node, Pub
>+ %%<li>The node does not support persistent items.</li>
>+ %%<li>The service does not support the deletion of items.</li>
>+ %%</ul>
>+--spec(delete_item/4 ::
>++-spec(delete_item
>+     (
>+ 	Host      :: mod_pubsub:host(),
>+ 	Node      :: mod_pubsub:nodeId(),
>+@@ -2371,7 +2371,7 @@ delete_item(Host, Node, Publisher, ItemI
>+ %%<li>The node is not configured to persist items.</li>
>+ %%<li>The specified node does not exist.</li>
>+ %%</ul>
>+--spec(purge_node/3 ::
>++-spec(purge_node
>+     (
>+ 	Host  :: mod_pubsub:host(),
>+ 	Node  :: mod_pubsub:nodeId(),
>+@@ -2423,7 +2423,7 @@ purge_node(Host, Node, Owner) ->
>+ %% <p>The permission are not checked in this function.</p>
>+ %% @todo We probably need to check that the user doing the query has the right
>+ %% to read the items.
>+--spec(get_items/7 ::
>++-spec(get_items
>+     (
>+ 	Host      :: mod_pubsub:host(),
>+ 	Node      :: mod_pubsub:nodeId(),
>+@@ -2598,7 +2598,7 @@ dispatch_items(From, To, _Node, Stanza) 
>+     ejabberd_router:route(service_jid(From), jid:make(To), Stanza).
>+ 
>+ %% @doc <p>Return the list of affiliations as an XMPP response.</p>
>+--spec(get_affiliations/4 ::
>++-spec(get_affiliations
>+     (
>+ 	Host    :: mod_pubsub:host(),
>+ 	Node    :: mod_pubsub:nodeId(),
>+@@ -2651,7 +2651,7 @@ get_affiliations(Host, Node, JID, Plugin
>+ 	    Error
>+     end.
>+ 
>+--spec(get_affiliations/3 ::
>++-spec(get_affiliations
>+     (
>+ 	Host :: mod_pubsub:host(),
>+ 	Node :: mod_pubsub:nodeId(),
>+@@ -2696,7 +2696,7 @@ get_affiliations(Host, Node, JID) ->
>+ 	    Error
>+     end.
>+ 
>+--spec(set_affiliations/4 ::
>++-spec(set_affiliations
>+     (
>+ 	Host        :: mod_pubsub:host(),
>+ 	Node        :: mod_pubsub:nodeId(),
>+@@ -3101,7 +3101,7 @@ set_subscriptions(Host, Node, From, Enti
>+ 	    end
>+     end.
>+ 
>+--spec(get_presence_and_roster_permissions/5 ::
>++-spec(get_presence_and_roster_permissions
>+     (
>+ 	Host          :: mod_pubsub:host(),
>+ 	From          :: ljid(),
>+@@ -3167,7 +3167,7 @@ subscription_to_string(pending) -> <<"pe
>+ subscription_to_string(unconfigured) -> <<"unconfigured">>;
>+ subscription_to_string(_) -> <<"none">>.
>+ 
>+--spec(service_jid/1 ::
>++-spec(service_jid
>+     (
>+ 	Host :: mod_pubsub:host())
>+     -> jid()
>+@@ -3207,7 +3207,7 @@ sub_option_can_deliver(_, _, {deliver, f
>+ sub_option_can_deliver(_, _, {expire, When}) -> p1_time_compat:timestamp() < When;
>+ sub_option_can_deliver(_, _, _) -> true.
>+ 
>+--spec(presence_can_deliver/2 ::
>++-spec(presence_can_deliver
>+     (
>+ 	Entity :: ljid(),
>+ 	_      :: boolean())
>+@@ -3233,7 +3233,7 @@ presence_can_deliver({User, Server, Reso
>+ 		false, Ss)
>+     end.
>+ 
>+--spec(state_can_deliver/2 ::
>++-spec(state_can_deliver
>+     (
>+ 	Entity::ljid(),
>+ 	SubOptions :: mod_pubsub:subOptions() | [])
>+@@ -3258,7 +3258,7 @@ state_can_deliver({U, S, R}, SubOptions)
>+ 		[], Resources)
>+     end.
>+ 
>+--spec(get_resource_state/3 ::
>++-spec(get_resource_state
>+     (
>+ 	Entity     :: ljid(),
>+ 	ShowValues :: [binary()],
>+@@ -3283,7 +3283,7 @@ get_resource_state({U, S, R}, ShowValues
>+ 	    end
>+     end.
>+ 
>+--spec(payload_xmlelements/1 ::
>++-spec(payload_xmlelements
>+     (
>+ 	Payload :: mod_pubsub:payload())
>+     -> Count :: non_neg_integer()
>+@@ -4029,7 +4029,7 @@ unset_cached_item(Host, Nidx) ->
>+ 	_ -> ok
>+     end.
>+ 
>+--spec(get_cached_item/2 ::
>++-spec(get_cached_item
>+     (
>+ 	Host    :: mod_pubsub:host(),
>+ 	Nidx :: mod_pubsub:nodeIdx())
>+@@ -4329,7 +4329,7 @@ string_to_ljid(JID) ->
>+ 	    end
>+     end.
>+ 
>+--spec(uniqid/0 :: () -> mod_pubsub:itemId()).
>++-spec(uniqid () -> mod_pubsub:itemId()).
>+ uniqid() ->
>+     {T1, T2, T3} = p1_time_compat:timestamp(),
>+     iolist_to_binary(io_lib:fwrite("~.16B~.16B~.16B", [T1, T2, T3])).
>+@@ -4344,7 +4344,7 @@ itemsEls(Items) ->
>+     [#xmlel{name = <<"item">>, attrs = itemAttr(ItemId), children = Payload}
>+ 	|| #pubsub_item{itemid = {ItemId, _}, payload = Payload} <- Items].
>+ 
>+--spec(add_message_type/2 ::
>++-spec(add_message_type
>+     (
>+ 	Message :: xmlel(),
>+ 	Type    :: atom())
>
>Property changes on: files/patch-mod__pubsub.erl
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-node__flat__sql.erl
>===================================================================
>--- files/patch-node__flat__sql.erl	(nonexistent)
>+++ files/patch-node__flat__sql.erl	(working copy)
>@@ -0,0 +1,98 @@
>+--- src/node_flat_sql.erl.orig	2016-09-07 00:41:00 UTC
>++++ src/node_flat_sql.erl
>+@@ -382,7 +382,7 @@ get_entity_subscriptions(Host, Owner) ->
>+     end,
>+     {result, Reply}.
>+ 
>+--spec(get_entity_subscriptions_for_send_last/2 ::
>++-spec(get_entity_subscriptions_for_send_last
>+     (
>+ 	Host :: mod_pubsub:hostPubsub(),
>+ 	Owner :: jid())
>+@@ -583,7 +583,7 @@ get_state(Nidx, JID) ->
>+     {SJID, _} = State#pubsub_state.stateid,
>+     State#pubsub_state{items = itemids(Nidx, SJID)}.
>+ 
>+--spec(get_state_without_itemids/2 ::
>++-spec(get_state_without_itemids
>+     (Nidx :: mod_pubsub:nodeIdx(),
>+ 	Key :: ljid()) ->
>+     mod_pubsub:pubsubState()
>+@@ -964,14 +964,14 @@ update_subscription(Nidx, JID, Subscript
>+ 			"values('">>, Nidx, <<"', '">>, J, <<"', 'n', '">>, S, <<"');">>])
>+     end.
>+ 
>+--spec(decode_jid/1 ::
>++-spec(decode_jid
>+     (   SJID :: binary())
>+     -> ljid()
>+     ).
>+ decode_jid(SJID) ->
>+     jid:tolower(jid:from_string(SJID)).
>+ 
>+--spec(decode_affiliation/1 ::
>++-spec(decode_affiliation
>+     (   Arg :: binary())
>+     -> atom()
>+     ).
>+@@ -982,7 +982,7 @@ decode_affiliation(<<"m">>) -> member;
>+ decode_affiliation(<<"c">>) -> outcast;
>+ decode_affiliation(_) -> none.
>+ 
>+--spec(decode_subscription/1 ::
>++-spec(decode_subscription
>+     (   Arg :: binary())
>+     -> atom()
>+     ).
>+@@ -991,7 +991,7 @@ decode_subscription(<<"p">>) -> pending;
>+ decode_subscription(<<"u">>) -> unconfigured;
>+ decode_subscription(_) -> none.
>+ 
>+--spec(decode_subscriptions/1 ::
>++-spec(decode_subscriptions
>+     (   Subscriptions :: binary())
>+     -> [] | [{atom(), binary()},...]
>+     ).
>+@@ -1004,21 +1004,21 @@ decode_subscriptions(Subscriptions) ->
>+ 	end,
>+ 	[], str:tokens(Subscriptions, <<",">>)).
>+ 
>+--spec(encode_jid/1 ::
>++-spec(encode_jid
>+     (   JID :: ljid())
>+     -> binary()
>+     ).
>+ encode_jid(JID) ->
>+     ejabberd_sql:escape(jid:to_string(JID)).
>+ 
>+--spec(encode_host/1 ::
>++-spec(encode_host
>+     (   Host :: host())
>+     -> binary()
>+     ).
>+ encode_host({_U, _S, _R} = LJID) -> encode_jid(LJID);
>+ encode_host(Host) -> ejabberd_sql:escape(Host).
>+ 
>+--spec(encode_affiliation/1 ::
>++-spec(encode_affiliation
>+     (   Arg :: atom())
>+     -> binary()
>+     ).
>+@@ -1029,7 +1029,7 @@ encode_affiliation(member) -> <<"m">>;
>+ encode_affiliation(outcast) -> <<"c">>;
>+ encode_affiliation(_) -> <<"n">>.
>+ 
>+--spec(encode_subscription/1 ::
>++-spec(encode_subscription
>+     (   Arg :: atom())
>+     -> binary()
>+     ).
>+@@ -1038,7 +1038,7 @@ encode_subscription(pending) -> <<"p">>;
>+ encode_subscription(unconfigured) -> <<"u">>;
>+ encode_subscription(_) -> <<"n">>.
>+ 
>+--spec(encode_subscriptions/1 ::
>++-spec(encode_subscriptions
>+     (   Subscriptions :: [] | [{atom(), binary()},...])
>+     -> binary()
>+     ).
>
>Property changes on: files/patch-node__flat__sql.erl
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-nodetree__dag.erl
>===================================================================
>--- files/patch-nodetree__dag.erl	(nonexistent)
>+++ files/patch-nodetree__dag.erl	(working copy)
>@@ -0,0 +1,29 @@
>+--- src/nodetree_dag.erl.orig	2016-09-07 00:38:05 UTC
>++++ src/nodetree_dag.erl
>+@@ -167,7 +167,7 @@ oid(Key, Name) -> {Key, Name}.
>+ 
>+ %% Key    = jlib:jid() | host()
>+ %% Node = string()
>+--spec(find_node/2 ::
>++-spec(find_node
>+     (
>+ 	Key :: mod_pubsub:hostPubsub(),
>+ 	Node :: mod_pubsub:nodeId())
>+@@ -188,7 +188,7 @@ find_opt(Key, Default, Options) ->
>+ 	_ -> Default
>+     end.
>+ 
>+--spec(traversal_helper/4 ::
>++-spec(traversal_helper
>+     (
>+ 	Pred    :: fun(),
>+ 		    Tr      :: fun(),
>+@@ -220,7 +220,7 @@ remove_config_parent(Node, [{collection,
>+ remove_config_parent(Node, [H | T], Acc) ->
>+     remove_config_parent(Node, T, [H | Acc]).
>+ 
>+--spec(validate_parentage/3 ::
>++-spec(validate_parentage
>+     (
>+ 	Key            :: mod_pubsub:hostPubsub(),
>+ 	Owners         :: [ljid(),...],
>
>Property changes on: files/patch-nodetree__dag.erl
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-pubsub__subscription.erl
>===================================================================
>--- files/patch-pubsub__subscription.erl	(nonexistent)
>+++ files/patch-pubsub__subscription.erl	(working copy)
>@@ -0,0 +1,56 @@
>+--- src/pubsub_subscription.erl.orig	2016-09-07 00:29:55 UTC
>++++ src/pubsub_subscription.erl
>+@@ -152,7 +152,7 @@ create_table() ->
>+ 	Other -> Other
>+     end.
>+ 
>+--spec(add_subscription/3 ::
>++-spec(add_subscription
>+     (
>+ 	_JID    :: ljid(),
>+ 	_NodeId :: mod_pubsub:nodeIdx(),
>+@@ -166,7 +166,7 @@ add_subscription(_JID, _NodeId, Options)
>+     mnesia:write(#pubsub_subscription{subid = SubID, options = Options}),
>+     SubID.
>+ 
>+--spec(delete_subscription/3 ::
>++-spec(delete_subscription
>+     (
>+ 	_JID    :: _,
>+ 	_NodeId :: _,
>+@@ -177,7 +177,7 @@ add_subscription(_JID, _NodeId, Options)
>+ delete_subscription(_JID, _NodeId, SubID) ->
>+     mnesia:delete({pubsub_subscription, SubID}).
>+ 
>+--spec(read_subscription/3 ::
>++-spec(read_subscription
>+     (
>+ 	_JID    :: ljid(),
>+ 	_NodeId :: _,
>+@@ -192,7 +192,7 @@ read_subscription(_JID, _NodeId, SubID) 
>+ 	_ -> {error, notfound}
>+     end.
>+ 
>+--spec(write_subscription/4 ::
>++-spec(write_subscription
>+     (
>+ 	_JID    :: ljid(),
>+ 	_NodeId :: _,
>+@@ -204,7 +204,7 @@ read_subscription(_JID, _NodeId, SubID) 
>+ write_subscription(_JID, _NodeId, SubID, Options) ->
>+     mnesia:write(#pubsub_subscription{subid = SubID, options = Options}).
>+ 
>+--spec(make_subid/0 :: () -> SubId::mod_pubsub:subId()).
>++-spec(make_subid () -> SubId::mod_pubsub:subId()).
>+ make_subid() ->
>+     {T1, T2, T3} = p1_time_compat:timestamp(),
>+     iolist_to_binary(io_lib:fwrite("~.16B~.16B~.16B", [T1, T2, T3])).
>+@@ -272,7 +272,7 @@ xopt_to_bool(Option, _) ->
>+     ErrTxt = iolist_to_binary(io_lib:format(Txt, [Option])),
>+     {error, ?ERRT_NOT_ACCEPTABLE(?MYLANG, ErrTxt)}.
>+ 
>+--spec(get_option_xfield/3 ::
>++-spec(get_option_xfield
>+     (
>+ 	Lang :: binary(),
>+ 	Key  :: atom(),
>
>Property changes on: files/patch-pubsub__subscription.erl
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-pubsub__subscription__sql.erl
>===================================================================
>--- files/patch-pubsub__subscription__sql.erl	(nonexistent)
>+++ files/patch-pubsub__subscription__sql.erl	(working copy)
>@@ -0,0 +1,47 @@
>+--- src/pubsub_subscription_sql.erl.orig	2016-09-07 00:26:07 UTC
>++++ src/pubsub_subscription_sql.erl
>+@@ -73,7 +73,7 @@
>+ 
>+ init() -> ok = create_table().
>+ 
>+--spec(subscribe_node/3 ::
>++-spec(subscribe_node
>+     (
>+ 	_JID    :: _,
>+ 	_NodeId :: _,
>+@@ -85,7 +85,7 @@ subscribe_node(_JID, _NodeId, Options) -
>+     (?DB_MOD):add_subscription(#pubsub_subscription{subid = SubID, options = Options}),
>+     {result, SubID}.
>+ 
>+--spec(unsubscribe_node/3 ::
>++-spec(unsubscribe_node
>+     (
>+ 	_JID :: _,
>+ 	_NodeId :: _,
>+@@ -99,7 +99,7 @@ unsubscribe_node(_JID, _NodeId, SubID) -
>+ 	notfound -> {error, notfound}
>+     end.
>+ 
>+--spec(get_subscription/3 ::
>++-spec(get_subscription
>+     (
>+ 	_JID    :: _,
>+ 	_NodeId :: _,
>+@@ -113,7 +113,7 @@ get_subscription(_JID, _NodeId, SubID) -
>+ 	notfound -> {error, notfound}
>+     end.
>+ 
>+--spec(set_subscription/4 ::
>++-spec(set_subscription
>+     (
>+ 	_JID    :: _,
>+ 	_NodeId :: _,
>+@@ -167,7 +167,7 @@ parse_options_xform(XFields) ->
>+ %%====================================================================
>+ create_table() -> ok.
>+ 
>+--spec(make_subid/0 :: () -> mod_pubsub:subId()).
>++-spec(make_subid () -> mod_pubsub:subId()).
>+ make_subid() ->
>+     {T1, T2, T3} = p1_time_compat:timestamp(),
>+     iolist_to_binary(io_lib:fwrite("~.16B~.16B~.16B", [T1, T2, T3])).
>
>Property changes on: files/patch-pubsub__subscription__sql.erl
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 212410: 174413 | 174451