Merge branch 'maint'

[paraslash.git] / ggo / server.m4

diff --git a/ggo/server.m4 b/ggo/server.m4
index 30c3b41a45919715ca495c80697fb618d16f0068..df94357577ea128325ee97f729a7a2e2459f1603 100644 (file)
--- a/ggo/server.m4
+++ b/ggo/server.m4
@@ -104,7 +104,7 @@ option "afs_socket" s
 #~~~~~~~~~~~~~~~~~~~~
 "Command socket for afs"
 string typestr="path"
-default="/var/paraslash/afs_command_socket"
+default="/var/paraslash/afs_command_socket-0.4"
 optional
 details="
        For each server command that is handled by the audio file
@@ -243,16 +243,23 @@ section "udp sender"
 
 option "udp_target" -
 #~~~~~~~~~~~~~~~~~~~~
-"add udp target"
-string typestr="a.b.c.d:p"
+"add udp target with optional port"
+string typestr="host[:port]"
 optional
 multiple
 details="
-       Add given host/port to the list of targets.  This option
-       can be given multiple times. Example: '224.0.1.38:1500'
-       instructs the udp sender to send to udp port 1500 on host
-       224.0.1.38 (unassigned ip in the Local Network Control Block
-       224.0.0/24). This is useful for multicast streaming.
+       Add given host/port to the list of targets. The 'host' argument
+       can be either an IPv4/v6 address or hostname (RFC 3986 syntax).
+       The 'port' argument is an optional port number. If the 'port'
+       part is absent, the 'udp_default_port' value is used.
+
+       The following examples are possible targets:
+       '10.10.1.2:8000' (host:port); '10.10.1.2' (with default port);
+       '224.0.1.38:1500' (IPv4 multicast); 'localhost:8001' (hostname
+       with port); '[::1]:8001' (IPv6 localhost); '[badc0de::1]' (IPv6
+       host with default port); '[FF00::beef]:1500' (IPv6 multicast).
+
+       This option can be given multiple times, for multiple targets.
 "
 
 option "udp_no_autostart" -
@@ -271,6 +278,12 @@ int typestr="port"
 default="8000"
 optional
 
+option "udp_mcast_iface" -
+#~~~~~~~~~~~~~~~~~~~~~~~~~~
+"outgoing udp multicast interface"
+string
+optional
+
 option "udp_header_interval" H
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 "duration for sending header"
@@ -292,11 +305,19 @@ option "udp_ttl" t
 #~~~~~~~~~~~~~~~~~
 "set time to live value"
 int typestr="num"
-default="10"
+default="-1"
 optional
 details="
-       This option instructs the udp sender to set the time to live to
-       \"num\" for the sending udp socket. Only useful for multicast
-       udp streaming.
+       This option applies exclusively to multicast UDPv4/v6 streaming.
+
+       For the sending UDPv4 socket it sets the multicast Time-To-Live
+       value to \"num\".  Traditional TTL scope values are: 0=host,
+       1=network, 32=same site, 64=same region, 128=same continent,
+       255=unrestricted. Please note however that this scoping is not
+       a good solution: RFC 2365 e.g. presents a better alternative.
+
+       When using UDPv6 multicasting, the option sets the number of
+       multicast hops (as described in RFC 3493); a value of -1
+       allows the kernel to auto-select the hop value.
 "
 </qu>