[Touch.Server] Fix parsing of -address, -port and -logpath options (#97)

rpendleton · web-flow · commit 425c3b2a7f8a · 2021-01-08T15:27:21.000-05:00
diff --git a/Touch.Server/Main.cs b/Touch.Server/Main.cs
@@ -148,8 +148,8 @@ public static int Main (string[] args)
 		
 		bool help = false;
 		bool verbose = false;
-		string address = null;
-		string port = null;
+		IPAddress ipAddress = IPAddress.Any;
+		ushort port = 0;
 		string log_path = ".";
 		string log_file = null;
 		string launchdev = null;
@@ -165,9 +165,9 @@ public static int Main (string[] args)
 		var os = new OptionSet () {
 			{ "h|?|help", "Display help", v => help = true },
 			{ "verbose", "Display verbose output", v => verbose = true },
-			{ "ip", "IP address to listen (default: Any)", v => address = v },
-			{ "port", "TCP port to listen (default: Any)", v => port = v },
-			{ "logpath", "Path to save the log files (default: .)", v => log_path = v },
+			{ "ip=", "IP address to listen (default: Any)", v => ipAddress = IPAddress.Parse (v) },
+			{ "port=", "TCP port to listen (default: Any)", v => port = ushort.Parse (v) },
+			{ "logpath=", "Path to save the log files (default: .)", v => log_path = v },
 			{ "logfile=", "Filename to save the log to (default: automatically generated)", v => log_file = v },
 			{ "launchdev=", "Run the specified app on a device (specify using bundle identifier)", v => launchdev = v },
 			{ "launchsim=", "Run the specified app on the simulator (specify using path to *.app directory)", v => launchsim = v },
@@ -187,14 +187,8 @@ public static int Main (string[] args)
 			
 			var listener = new SimpleListener ();
 			
-			IPAddress ip;
-			if (String.IsNullOrEmpty (address) || !IPAddress.TryParse (address, out ip))
-				listener.Address = IPAddress.Any;
-			
-			ushort p;
-			if (UInt16.TryParse (port, out p))
-				listener.Port = p;
-			
+			listener.Address = ipAddress;
+			listener.Port = port;
 			listener.LogPath = log_path ?? ".";
 			listener.LogFile = log_file;
 			listener.AutoExit = autoexit;
@@ -402,4 +396,4 @@ static string Quote (string f)
 
    [DllImport ("libc")]
    private static extern void kill (int pid, int sig);
-}
+}
