cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-29 16:11:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean up how connectivity level is determined

Browse Source
This commit is contained in:
Cyberboss
2017-10-31 15:09:23 -04:00
parent 6373fa4f28
commit e6f44a10b3
9 changed files with 79 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGCommandLine/Program.cs
+11 -11
View File
@@ -64,21 +64,21 @@ namespace TGCommandLine
return Command.ExitCode.BadCommand;
}
var res = currentInterface.VerifyConnection();
if (res != null)
var res = currentInterface.ConnectionStatus(out string error);
if (!res.HasFlag(ConnectivityLevel.Connected))
{
Console.WriteLine("Unable to connect to service: " + res);
Console.WriteLine("Unable to connect to service: " + error);
Console.WriteLine("Remote connection usage: <-c/--connect> username:password@address:port");
return Command.ExitCode.ConnectionError;
}
if (!currentInterface.Authenticate())
if (!res.HasFlag(ConnectivityLevel.Authenticated))
{
Console.WriteLine("Authentication error: Username/password/windows identity is not authorized!");
return Command.ExitCode.ConnectionError;
}
if (!SentVMMWarning && currentInterface.VersionMismatch(out string error))
if (!SentVMMWarning && currentInterface.VersionMismatch(out error))
{
SentVMMWarning = true;
Console.WriteLine(error);
@@ -190,13 +190,13 @@ namespace TGCommandLine
Console.Write("Enter password: ");
var password = ReadLineSecure();
ReplaceInterface(new Interface(address, port, username, password));
var res = currentInterface.VerifyConnection();
if (res != null)
var res = currentInterface.ConnectionStatus(out string error);
if (!res.HasFlag(ConnectivityLevel.Connected))
{
Console.WriteLine("Unable to connect: " + res);
Console.WriteLine("Unable to connect: " + error);
ReplaceInterface(new Interface());
}
else if (!currentInterface.Authenticate())
else if (!res.HasFlag(ConnectivityLevel.Authenticated))
{
Console.WriteLine("Authentication error: Username/password/windows identity is not authorized! Returning to local mode...");
ReplaceInterface(new Interface());
@@ -204,10 +204,10 @@ namespace TGCommandLine
else
{
Console.WriteLine("Connected remotely");
if (currentInterface.VersionMismatch(out res))
if (currentInterface.VersionMismatch(out error))
{
SentVMMWarning = true;
Console.WriteLine(res);
Console.WriteLine(error);
}
Console.WriteLine("Type 'disconnect' to return to local mode");
}