M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 1
Code Issues Projects Releases Wiki Activity

tools: support wildcard bind: --bind '*'

This commit is contained in:
Robert Jördens 2016-07-18 18:30:34 +02:00
parent b9000fa267
commit 9785b39edd
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
artiq/tools.py
View File

@ -121,16 +121,17 @@ def simple_network_args(parser, default_port):
group = parser.add_argument_group("network server") group = parser.add_argument_group("network server")
group.add_argument( group.add_argument(
"--bind", default=[], action="append", "--bind", default=[], action="append",
help="add an hostname or IP address to bind to") help="additional hostname or IP addresse to bind to; "
"use '*' to bind to all interfaces (default: %(default)s)")
group.add_argument( group.add_argument(
"--no-localhost-bind", default=False, action="store_true", "--no-localhost-bind", default=False, action="store_true",
help="do not implicitly bind to localhost addresses") help="do not implicitly also bind to localhost addresses")
if isinstance(default_port, int): if isinstance(default_port, int):
group.add_argument("-p", "--port", default=default_port, type=int, group.add_argument("-p", "--port", default=default_port, type=int,
help="TCP port to listen to (default: %(default)d)") help="TCP port to listen to (default: %(default)d)")
else: else:
for name, purpose, default in default_port: for name, purpose, default in default_port:
h = ("TCP port to listen to for {} (default: {})" h = ("TCP port to listen to on for {} connections (default: {})"
.format(purpose, default)) .format(purpose, default))
group.add_argument("--port-" + name, default=default, type=int, group.add_argument("--port-" + name, default=default, type=int,
help=h) help=h)
@ -164,6 +165,8 @@ def init_logger(args):
def bind_address_from_args(args): def bind_address_from_args(args):
if "*" in args.bind:
return None
if args.no_localhost_bind: if args.no_localhost_bind:
return args.bind return args.bind
else: else: