X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=m4%2Flls%2Fserver.suite.m4;h=93e4b573e5ae694581b5f111f1a898d45b6c4f7b;hp=6ffdc0078ad15bc02043dda9cd953fb758347ac5;hb=cb920d36d5fbd7888a2890a759d852f4b3089b3f;hpb=e2167286448ce2ed9a01a548e7e9832563035088

diff --git a/m4/lls/server.suite.m4 b/m4/lls/server.suite.m4
index 6ffdc007..93e4b573 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
@@ -144,6 +171,18 @@ version-string = GIT_VERSION()
 	[option http]
 		summary = Options for the http sender
 		flag ignored
+	[option http-listen-address]
+		summary = listening addresses of the http sender
+		arg_info = required_arg
+		arg_type = string
+		typestr = addr
+		flag multiple
+		[help]
+			The http sender of para_server listens on this port for incoming data
+			connections. This option controls on which addresses the http sender
+			should listen. See the documentation of the --listen-address above
+			for the format of the address argument and the defaults.
+		[/help]
 	[option http-port]
 		summary = TCP port for http streaming
 		arg_info = required_arg
@@ -151,9 +190,9 @@ version-string = GIT_VERSION()
 		typestr = portnumber
 		default_val = 8000
 		[help]
-			The http sender of para_server listens on this port for incoming
-			connections. Clients are expected to send the usual http request
-			message such as 'GET / HTTP/'.
+			This option has the same meaning as --port, but applies to http
+			data connections and applies to the addresses specified as arguments
+			to --http-listen-address.
 		[/help]
 	[option http-default-deny]
 		summary = make the http access control list a whitelist
@@ -202,6 +241,15 @@ version-string = GIT_VERSION()
 	[option dccp]
 		summary = Options for the dccp sender
 		flag ignored
+	[option dccp-listen-address]
+		summary = listening addresses of the dccp sender
+		arg_info = required_arg
+		arg_type = string
+		typestr = addr
+		flag multiple
+		[help]
+			Like --http-listen-address, but for the dccp sender.
+		[/help]
 	[option dccp-port]
 		summary = port for dccp streaming
 		arg_info = required_arg
@@ -225,6 +273,11 @@ version-string = GIT_VERSION()
 		[help]
 			See --http-access for details.
 		[/help]
+	[option dccp-no-autostart]
+		summary = do not open the DCCP port on startup
+		[help]
+			This is like --http-no-autostart but applies to the dccp sender.
+		[/help]
 	[option dccp-max-clients]
 		summary = maximal number of simultaneous dccp connections
 		arg_info = required_arg