From a289c9c685aceb6fc140e4da03b6bcae8668ac5c Mon Sep 17 00:00:00 2001 From: grossmj Date: Thu, 16 Jun 2016 11:27:10 -0600 Subject: [PATCH] Change option from udp_discovery to server_discovery. --- gns3server/run.py | 6 +++--- gns3server/web/web_server.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gns3server/run.py b/gns3server/run.py index 702a2c74..4aadc1fe 100644 --- a/gns3server/run.py +++ b/gns3server/run.py @@ -102,7 +102,7 @@ def parse_arguments(argv): parser.add_argument("--log", help="send output to logfile instead of console") parser.add_argument("--daemon", action="store_true", help="start as a daemon") parser.add_argument("--pid", help="store process pid") - parser.add_argument("--udpdiscovery", action="store_true", help="allow the server to be discover on the network") + parser.add_argument("--serverdiscovery", action="store_true", help="allows the server to be discovered on the network via broadcast or multicast on 239.42.42.1") args = parser.parse_args(argv) if args.config: @@ -122,7 +122,7 @@ def parse_arguments(argv): "quiet": config.getboolean("quiet", False), "debug": config.getboolean("debug", False), "logfile": config.getboolean("logfile", ""), - "udp_discovery": config.getboolean("udp_discovery", False), + "server_discovery": config.getboolean("server_discovery", False), } parser.set_defaults(**defaults) @@ -144,7 +144,7 @@ def set_config(args): server_config["record"] = args.record server_config["debug"] = str(args.debug) server_config["shell"] = str(args.shell) - server_config["udp_discovery"] = str(args.udpdiscovery) + server_config["server_discovery"] = str(args.serverdiscovery) config.set_section_config("Server", server_config) diff --git a/gns3server/web/web_server.py b/gns3server/web/web_server.py index 10d88226..1c29282a 100644 --- a/gns3server/web/web_server.py +++ b/gns3server/web/web_server.py @@ -299,7 +299,7 @@ class WebServer: if server_config.getboolean("shell"): asyncio.async(self.start_shell()) - if sys.platform.startswith("linux") and server_config.getboolean("udp_discovery"): + if sys.platform.startswith("linux") and server_config.getboolean("server_discovery"): # UDP discovery is only supported on Linux udp_server_discovery = threading.Thread(target=self._udp_server_discovery, daemon=True) udp_server_discovery.start()