From: Badlop Date: Tue, 11 Aug 2009 11:22:57 +0000 (+0000) Subject: More documentation for STUN server. X-Git-Tag: v2.1.0~18^2~142 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3eaf796cca1eefb274d78e09f693369c9de856a1;p=ejabberd More documentation for STUN server. * Add stun listener to example config file, disabled. * Improve enumeration of listeners options * Mention STUN in release notes * Mention new STUN listener in release notes * Mention new network protocol syntax in release notes SVN Revision: 2454 --- diff --git a/doc/guide.html b/doc/guide.html index 14149e66f..59091eb2d 100644 --- a/doc/guide.html +++ b/doc/guide.html @@ -630,7 +630,7 @@ other different modules for some specific virtual hosts: ]}.

3.1.3  Listening Ports

-

The option listen defines for which addresses, protocols and ports ejabberd +

The option listen defines for which ports, addresses and network protocols ejabberd will listen and what services will be run on them. Each element of the list is a tuple with the following elements:

+

The transport protocol can be tcp or udp. +Default is tcp.

Listening Module

The available modules, their purpose and the options allowed by each one are:

diff --git a/doc/guide.tex b/doc/guide.tex index c31e2e427..9b291b688 100644 --- a/doc/guide.tex +++ b/doc/guide.tex @@ -734,7 +734,7 @@ other different modules for some specific virtual hosts: \makesubsection{listened}{Listening Ports} \ind{options!listen} -The option \option{listen} defines for which addresses, protocols and ports \ejabberd{} +The option \option{listen} defines for which ports, addresses and network protocols \ejabberd{} will listen and what services will be run on them. Each element of the list is a tuple with the following elements: \begin{itemize} @@ -767,9 +767,6 @@ The port number defines which port to listen for incoming connections. It can be a Jabber/XMPP standard port (see section \ref{firewall}) or any other valid port number. -The transport protocol is always \term{tcp} or \term{udp} if defined. -Default is \term{tcp}. - The IP address can be represented with a string or an Erlang tuple with decimal or hexadecimal numbers. The socket will listen only in that network interface. @@ -788,6 +785,9 @@ Some example values for IP address: \item \verb|{16#fdca, 16#8ab6, 16#a243, 16#75ef, 0, 0, 0, 1}| is the IPv6 address \verb|FDCA:8AB6:A243:75EF::1/128| \end{itemize} +The transport protocol can be \term{tcp} or \term{udp}. +Default is \term{tcp}. + \makesubsubsection{listened-module}{Listening Module} diff --git a/doc/release_notes_2.1.0.txt b/doc/release_notes_2.1.0.txt index 0d8672335..21cf12600 100644 --- a/doc/release_notes_2.1.0.txt +++ b/doc/release_notes_2.1.0.txt @@ -54,10 +54,12 @@ - Check certfiles are readable on server start and listener start - Config file management mix file reading and sanity check - Include example PAM configuration file: ejabberd.pam +- New ejabberd listener: ejabberd_stun - Support to bind the same port to multiple interfaces - New syntax to specify the IP address and IPv6 in listeners configuration. The old options {ip,{1,2,3,4}} and inet6 are supported even if they aren't documented. +- New syntax to specify the network protocol: tcp or udp - Report error at startup if a listener module isn't available - Only listen in a port when actually ready to serve requests @@ -87,6 +89,9 @@ - HTTP-Bind: allow configuration of max_inactivity timeout - HTTP-Poll: turn session timeout into a config file parameter +* Jingle +- STUN server that facilitates the client-to-client negotiation process + * LDAP - Faster reconnection to LDAP servers - LDAP filter optimisation: Add ability to filter user in ejabberd and not LDAP @@ -159,6 +164,7 @@ - Added XEP-0085 Chat State Notifications - Added XEP-0157 Contact Addresses for XMPP Services - Added XEP-0158 CAPTCHA Forms (in MUC rooms) +- Added STUN server, for XEP-0176: Jingle ICE-UDP Transport Method - Added XEP-0199 XMPP Ping - Added XEP-0202 Entity Time - Added XEP-0203 Delayed Delivery diff --git a/src/ejabberd.cfg.example b/src/ejabberd.cfg.example index a91c3945a..a4bedb81a 100644 --- a/src/ejabberd.cfg.example +++ b/src/ejabberd.cfg.example @@ -149,6 +149,11 @@ %% } %% ]}, + %% + %% ejabberd_stun: Handles STUN Binding requests + %% + %%{{3478, udp}, ejabberd_stun, []}, + {5280, ejabberd_http, [ %%{request_handlers, %% [