X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=m4%2Flls%2Fserver.suite.m4;h=89cf3521bf350e2273652b139d3e78c73ff7fcfa;hp=5bba85d4348c3254ad19d2ac91007dc0e3fefc53;hb=631fb4db2cea7bc44e91631957db8cd852fe75ee;hpb=b59e841036a107b52a0221e48d7e05f86da92979

diff --git a/m4/lls/server.suite.m4 b/m4/lls/server.suite.m4
index 5bba85d4..89cf3521 100644
--- a/m4/lls/server.suite.m4
+++ b/m4/lls/server.suite.m4
@@ -34,18 +34,45 @@ version-string = GIT_VERSION()
 	m4_include(log-timing.m4)
 	m4_include(color.m4)
 	m4_include(per-command-options-section.m4)
+	[option listen-address]
+		summary = local listening addresses for the control service
+		arg_info = required_arg
+		arg_type = string
+		typestr = addr
+		flag multiple
+		[help]
+			para_server listens on a TCP socket for incoming connections from
+			para_client or para_audiod. This option controls on which addresses
+			the server should listen. If the option is not given, the server
+			listens on all local addresses (INADDR_ANY for IPv4 addresses,
+			IN6ADDR_ANY_INIT for IPv6 addresses).
+
+			The argument specifies an IPv4 or an IPv6 address, either a numerical
+			network address (for IPv4, numbers-and-dots notation as supported
+			by inet_aton(3); for IPv6, hexadecimal string format as supported
+			by inet_pton(3)), or a network hostname, whose network addresses is
+			looked up and resolved. The address can optionally include a port
+			number. For addresses for which no port number is given, the argument
+			of the --port option (see below) is implied.
+
+			This option may be given multiple times. The server will then listen
+			on each of the specified addresses.
+
+			Examples: 10.10.1.1, 10.10.1.2:2991, localhost, localhost:2991,
+			[::1]:2991, [badc0de::1].
+		[/help]
 	[option port]
 		short_opt = p
-		summary = listening port of the paraslash control service
+		summary = listening port of the control service
 		arg_info = required_arg
 		arg_type = uint32
 		typestr = portnumber
 		default_val = 2990
 		[help]
-			para_server listens on this TCP port for incoming connections
-			from clients such as para_client. If the default port is changed,
-			the corresponding option of para_client must be used to connect
-			to para_server.
+			This option applies only to addresses given to --listen-address
+			(see above) which do no include a port number. If the default port
+			is changed, the corresponding option of para_client must be used to
+			connect to para_server.
 		[/help]
 	[option user-list]
 		summary = file which contains user names and credentials