Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Hide PuTTY sessions from PuTTY Saved Sessions if no host is set. Show "Default Settings" if host is set. Default to SSH2 if "Protocol" or "SshProt" are not set (matching behavior of PuTTY).

Browse Source
This commit is contained in:
Riley McArdle
2013-05-05 19:55:52 -05:00
parent 7b850892ae
commit f3075f4c51
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mRemoteV1/Config/PuttySessions.vb
View File

@@ -85,9 +85,8 @@ Namespace Config
Dim sessionList As New List(Of Connection.PuttySession.Info)
Dim sessionInfo As Connection.Info
For Each sessionName As String In GetSessionNames(True)
If sessionName = "Default%20Settings" Then Continue For ' Do not localize
sessionInfo = SessionToConnectionInfo(sessionName)
If sessionInfo Is Nothing Then Continue For
If sessionInfo Is Nothing OrElse String.IsNullOrEmpty(sessionInfo.Hostname) Then Continue For
sessionList.Add(sessionInfo)
Next
Return sessionList.ToArray()
@@ -109,7 +108,7 @@ Namespace Config
.Hostname = sessionKey.GetValue("HostName")
.Username = sessionKey.GetValue("UserName")
Dim protocol As String = sessionKey.GetValue("Protocol")
If protocol Is Nothing Then Return Nothing
If protocol Is Nothing Then protocol = "ssh"
Select Case protocol.ToLowerInvariant()
Case "raw"
.Protocol = Protocols.RAW
@@ -118,11 +117,16 @@ Namespace Config
Case "serial"
Return Nothing
Case "ssh"
Dim sshVersion As Integer = sessionKey.GetValue("SshProt")
If sshVersion >= 2 Then
.Protocol = Protocols.SSH2
Dim sshVersionObject As Object = sessionKey.GetValue("SshProt")
If sshVersionObject IsNot Nothing Then
Dim sshVersion As Integer = CType(sshVersionObject, Integer)
If sshVersion >= 2 Then
.Protocol = Protocols.SSH2
Else
.Protocol = Protocols.SSH1
End If
Else
.Protocol = Protocols.SSH1
.Protocol = Protocols.SSH2
End If
Case "telnet"
.Protocol = Protocols.Telnet