From 609a95318e47cb551049d21da513cd2819e59e42 Mon Sep 17 00:00:00 2001 From: Adam Piggott Date: Fri, 25 Mar 2016 09:46:47 +0000 Subject: [PATCH 1/2] Document tcp4:// tcp6:// prefixes Documenting https://github.com/syncthing/syncthing/pull/2880 --- users/config.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/users/config.rst b/users/config.rst index 39400cd99..cc6c48fd2 100644 --- a/users/config.rst +++ b/users/config.rst @@ -270,7 +270,7 @@ introducer In addition, one or more ``address`` child elements must be present. Each contains an address or host name to use when attempting to connect to this device and will -be tried in order. Entries other than ``dynamic`` must be prefixed with ``tcp://``. Accepted formats are: +be tried in order. Entries other than ``dynamic`` must be prefixed with ``tcp://`` (dual-stack), ``tcp4://`` (IPv4 only) or ``tcp6://` (IPv6 only). Note that IP addresses need not use tcp4/tcp6; these are optional. Accepted formats are: IPv4 address (``tcp://192.0.2.42``) The default port (22000) is used. @@ -286,8 +286,8 @@ IPv6 address and port (``tcp://[2001:db8::23:42]:12345``) The address and port is used as given. The address must be enclosed in square brackets. -Host name (``tcp://fileserver``) - The host name will be used on the default port (22000) and connections will be attempted via both IPv4 and IPv6, depending on name resolution. +Host name (``tcp6://fileserver``) + The host name will be used on the default port (22000) and connections will be attempted only via IPv6. Host name and port (``tcp://fileserver:12345``) The host name will be used on the given port and connections will be attempted via both IPv4 and IPv6, depending on name resolution. From 7c5b00deb1b83a41b19c59ed7613bbf502369b34 Mon Sep 17 00:00:00 2001 From: Adam Piggott Date: Fri, 25 Mar 2016 10:15:42 +0000 Subject: [PATCH 2/2] Add GUI Element address examples --- users/config.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/users/config.rst b/users/config.rst index cc6c48fd2..f6ca5d054 100644 --- a/users/config.rst +++ b/users/config.rst @@ -336,14 +336,18 @@ address IPv4 address and port (``127.0.0.1:8384``) The address and port is used as given. + IPv4 wildcard and port (``tcp4://0.0.0.0``, ``tcp4://:8384``) + These are equivalent and will result in Syncthing listening on all interfaces via IPv4 only. IPv6 address and port (``[::1]:8384``) The address and port is used as given. The address must be enclosed in square brackets. + IPv6 wildcard and port (``tcp6://[::]:8384``, ``tcp6://:8384``) + These are equivalent and will result in Syncthing listening on all interfaces via IPv6 only. Wildcard and port (``0.0.0.0:12345``, ``[::]:12345``, ``:12345``) These are equivalent and will result in Syncthing listening on all - interfaces and both IPv4 and IPv6. + interfaces via both IPv4 and IPv6. username Set to require authentication.