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

Document the new option s2s_dns_options, expressed in seconds (EJAB-994)

Browse Source 
SVN Revision: 2418
This commit is contained in:
Badlop 2009-08-03 15:04:52 +00:00
parent ce3fa18fb6
commit a321ab3653
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/guide.html
View File

@ -782,6 +782,10 @@ Full path to the file containing the SSL certificate for a specific domain.
Specify which address families to try, in what order, and connect timeout in milliseconds. Specify which address families to try, in what order, and connect timeout in milliseconds.
By default it first tries connecting with IPv4, if that fails it tries using IPv6, By default it first tries connecting with IPv4, if that fails it tries using IPv6,
with a timeout of 10000 milliseconds. with a timeout of 10000 milliseconds.
</DD><DT CLASS="dt-description"><B><TT>{s2s_dns_options, [{Property, Value}]}</TT></B></DT><DD CLASS="dd-description">
Define properties to use for DNS resolving.
Allowed Properties are: <TT>timeout</TT> in seconds which default value is <TT>10</TT>
and <TT>retries</TT> which default value is <TT>2</TT>.
</DD><DT CLASS="dt-description"><B><TT>{s2s_default_policy, allow|deny}</TT></B></DT><DD CLASS="dd-description"> </DD><DT CLASS="dt-description"><B><TT>{s2s_default_policy, allow|deny}</TT></B></DT><DD CLASS="dd-description">
The default policy for incoming and outgoing s2s connections to other Jabber servers. The default policy for incoming and outgoing s2s connections to other Jabber servers.
The default value is <TT>allow</TT>. The default value is <TT>allow</TT>.

4
doc/guide.tex
View File

@ -917,6 +917,10 @@ There are some additional global options that can be specified in the ejabberd c
Specify which address families to try, in what order, and connect timeout in milliseconds. Specify which address families to try, in what order, and connect timeout in milliseconds.
By default it first tries connecting with IPv4, if that fails it tries using IPv6, By default it first tries connecting with IPv4, if that fails it tries using IPv6,
with a timeout of 10000 milliseconds. with a timeout of 10000 milliseconds.
\titem{\{s2s\_dns\_options, [\{Property, Value\}]\}}
\ind{options!s2s\_dns\_options}Define properties to use for DNS resolving.
Allowed Properties are: \term{timeout} in seconds which default value is \term{10}
and \term{retries} which default value is \term{2}.
\titem{\{s2s\_default\_policy, allow|deny\}} \titem{\{s2s\_default\_policy, allow|deny\}}
The default policy for incoming and outgoing s2s connections to other Jabber servers. The default policy for incoming and outgoing s2s connections to other Jabber servers.
The default value is \term{allow}. The default value is \term{allow}.

4
src/ejabberd_s2s_out.erl
View File

@ -990,9 +990,9 @@ srv_lookup(Server) ->
L when is_list(L) -> L; L when is_list(L) -> L;
_ -> [] _ -> []
end, end,
Timeout = proplists:get_value(timeout, Options, timer:seconds(10)), TimeoutMs = timer:seconds(proplists:get_value(timeout, Options, 10)),
Retries = proplists:get_value(retries, Options, 2), Retries = proplists:get_value(retries, Options, 2),
srv_lookup(Server, Timeout, Retries). srv_lookup(Server, TimeoutMs, Retries).
%% XXX - this behaviour is suboptimal in the case that the domain %% XXX - this behaviour is suboptimal in the case that the domain
%% has a "_xmpp-server._tcp." but not a "_jabber._tcp." record and %% has a "_xmpp-server._tcp." but not a "_jabber._tcp." record and