Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

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

SVN Revision: 2417
This commit is contained in:
Badlop 2009-08-03 15:03:50 +00:00
parent 9fbef39193
commit 720fd7605d
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

@ -792,6 +792,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.
By default it first tries connecting with IPv4, if that fails it tries using IPv6,
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">
The default policy for incoming and outgoing s2s connections to other Jabber servers.
The default value is <TT>allow</TT>.

4
doc/guide.tex
View File

@ -931,6 +931,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.
By default it first tries connecting with IPv4, if that fails it tries using IPv6,
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\}}
The default policy for incoming and outgoing s2s connections to other Jabber servers.
The default value is \term{allow}.

4
src/ejabberd_s2s_out.erl
View File

@ -1037,9 +1037,9 @@ srv_lookup(Server) ->
L when is_list(L) -> L;
_ -> []
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),
srv_lookup(Server, Timeout, Retries).
srv_lookup(Server, TimeoutMs, Retries).
%% XXX - this behaviour is suboptimal in the case that the domain
%% has a "_xmpp-server._tcp." but not a "_jabber._tcp." record and