Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of git://github.com/rmcardle/mRemoteNG

  • Loading branch information...
commit 42f9d59f813434e650bf1ffb84695d214b3c08a7 2 parents baca2b3 + 016fcb1
@davidvidmar davidvidmar authored
View
2  mRemoteV1/App/App.Info.vb
@@ -35,7 +35,7 @@ Namespace App
Public Shared ReadOnly DefaultConnectionsPath As String = App.Info.Settings.SettingsPath
Public Shared ReadOnly DefaultConnectionsFile As String = "confCons.xml"
Public Shared ReadOnly DefaultConnectionsFileNew As String = "confConsNew.xml"
- Public Shared ReadOnly ConnectionFileVersion As Double = 2.1
+ Public Shared ReadOnly ConnectionFileVersion As Double = 2.2
End Class
Public Class Credentials
View
5 mRemoteV1/Config/Config.Connections.Load.vb
@@ -973,6 +973,11 @@ Namespace Config
conI.ExtApp = .Attributes("ExtApp").Value
conI.Inherit.ExtApp = .Attributes("InheritExtApp").Value
End If
+
+ If Me.confVersion > 2.1 Then '2.2
+ conI.RDGatewayHostname = .Attributes("RDGatewayHostname").Value
+ conI.Inherit.RDGatewayHostname = .Attributes("InheritRDGatewayHostname").Value
+ End If
End With
Return conI
View
8 mRemoteV1/Config/Config.Connections.Save.vb
@@ -638,6 +638,8 @@ Namespace Config
xW.WriteAttributeString("VNCSmartSizeMode", "", curConI.VNCSmartSizeMode.ToString)
xW.WriteAttributeString("VNCViewOnly", "", curConI.VNCViewOnly)
+ xW.WriteAttributeString("RDGatewayHostname", "", curConI.RDGatewayHostname)
+
If Me._SaveSecurity.Inheritance = True Then
xW.WriteAttributeString("InheritCacheBitmaps", "", curConI.Inherit.CacheBitmaps)
xW.WriteAttributeString("InheritColors", "", curConI.Inherit.Colors)
@@ -679,6 +681,7 @@ Namespace Config
xW.WriteAttributeString("InheritVNCColors", "", curConI.Inherit.VNCColors)
xW.WriteAttributeString("InheritVNCSmartSizeMode", "", curConI.Inherit.VNCSmartSizeMode)
xW.WriteAttributeString("InheritVNCViewOnly", "", curConI.Inherit.VNCViewOnly)
+ xW.WriteAttributeString("InheritRDGatewayHostname", "", curConI.Inherit.RDGatewayHostname)
Else
xW.WriteAttributeString("InheritCacheBitmaps", "", False)
xW.WriteAttributeString("InheritColors", "", False)
@@ -720,6 +723,7 @@ Namespace Config
xW.WriteAttributeString("InheritVNCColors", "", False)
xW.WriteAttributeString("InheritVNCSmartSizeMode", "", False)
xW.WriteAttributeString("InheritVNCViewOnly", "", False)
+ xW.WriteAttributeString("InheritRDGatewayHostname", "", False)
End If
Catch ex As Exception
mC.AddMessage(Messages.MessageClass.ErrorMsg, "SaveConnectionFields failed" & vbNewLine & ex.Message, True)
@@ -759,10 +763,10 @@ Namespace Config
csvLn += "Domain;"
End If
- csvLn += "Hostname;Protocol;PuttySession;Port;ConnectToConsole;RenderingEngine;ICAEncryptionStrength;RDPAuthenticationLevel;Colors;Resolution;DisplayWallpaper;DisplayThemes;CacheBitmaps;RedirectDiskDrives;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;RedirectKeys;PreExtApp;PostExtApp;MacAddress;UserField;ExtApp;VNCCompression;VNCEncoding;VNCAuthMode;VNCProxyType;VNCProxyIP;VNCProxyPort;VNCProxyUsername;VNCProxyPassword;VNCColors;VNCSmartSizeMode;VNCViewOnly;"
+ csvLn += "Hostname;Protocol;PuttySession;Port;ConnectToConsole;RenderingEngine;ICAEncryptionStrength;RDPAuthenticationLevel;Colors;Resolution;DisplayWallpaper;DisplayThemes;CacheBitmaps;RedirectDiskDrives;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;RedirectKeys;PreExtApp;PostExtApp;MacAddress;UserField;ExtApp;VNCCompression;VNCEncoding;VNCAuthMode;VNCProxyType;VNCProxyIP;VNCProxyPort;VNCProxyUsername;VNCProxyPassword;VNCColors;VNCSmartSizeMode;VNCViewOnly;RDGatewayHostname;"
If SaveSecurity.Inheritance Then
- csvLn += "InheritCacheBitmaps;InheritColors;InheritDescription;InheritDisplayThemes;InheritDisplayWallpaper;InheritDomain;InheritIcon;InheritPanel;InheritPassword;InheritPort;InheritProtocol;InheritPuttySession;InheritRedirectDiskDrives;InheritRedirectKeys;InheritRedirectPorts;InheritRedirectPrinters;InheritRedirectSmartCards;InheritRedirectSound;InheritResolution;InheritUseConsoleSession;InheritRenderingEngine;InheritUsername;InheritICAEncryptionStrength;InheritRDPAuthenticationLevel;InheritPreExtApp;InheritPostExtApp;InheritMacAddress;InheritUserField;InheritExtApp;InheritVNCCompression;InheritVNCEncoding;InheritVNCAuthMode;InheritVNCProxyType;InheritVNCProxyIP;InheritVNCProxyPort;InheritVNCProxyUsername;InheritVNCProxyPassword;InheritVNCColors;InheritVNCSmartSizeMode;InheritVNCViewOnly"
+ csvLn += "InheritCacheBitmaps;InheritColors;InheritDescription;InheritDisplayThemes;InheritDisplayWallpaper;InheritDomain;InheritIcon;InheritPanel;InheritPassword;InheritPort;InheritProtocol;InheritPuttySession;InheritRedirectDiskDrives;InheritRedirectKeys;InheritRedirectPorts;InheritRedirectPrinters;InheritRedirectSmartCards;InheritRedirectSound;InheritResolution;InheritUseConsoleSession;InheritRenderingEngine;InheritUsername;InheritICAEncryptionStrength;InheritRDPAuthenticationLevel;InheritPreExtApp;InheritPostExtApp;InheritMacAddress;InheritUserField;InheritExtApp;InheritVNCCompression;InheritVNCEncoding;InheritVNCAuthMode;InheritVNCProxyType;InheritVNCProxyIP;InheritVNCProxyPort;InheritVNCProxyUsername;InheritVNCProxyPassword;InheritVNCColors;InheritVNCSmartSizeMode;InheritVNCViewOnly;InheritRDGatewayHostname"
End If
View
33 mRemoteV1/Connection/Connection.Info.vb
@@ -1116,8 +1116,21 @@ Namespace Connection
End Set
End Property
#End Region
-
-
+#Region "RD Gateway"
+ Private _RDGatewayHostname As String
+ <Category(Category3 & Language.Base.Props_Protocol), _
+ Browsable(True), _
+ DisplayName(Language.Base.Props_RDGatewayHostname), _
+ Description(Language.Base.Descr_RDGatewayHostname)> _
+ Public Property RDGatewayHostname() As String
+ Get
+ Return Me._RDGatewayHostname
+ End Get
+ Set(ByVal value As String)
+ Me._RDGatewayHostname = value
+ End Set
+ End Property
+#End Region
Private _Inherit As Inheritance = New Inheritance(Me)
@@ -1982,6 +1995,22 @@ Namespace Connection
End Set
End Property
#End Region
+#Region "RD Gateway"
+ Private _RDGatewayHostname As Boolean = False
+ <Category(Category3 & Language.Base.Props_Protocol), _
+ Browsable(True), _
+ DisplayName(Language.Base.Inherit & " " & Language.Base.Props_RDGatewayHostname), _
+ TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
+ Public Property RDGatewayHostname() As Boolean
+ Get
+ Return Me._RDGatewayHostname
+ End Get
+ Set(ByVal value As Boolean)
+ Me._RDGatewayHostname = value
+ End Set
+ End Property
+#End Region
+
End Class
<Flags()> _
View
18 mRemoteV1/Connection/Connection.Protocol.RDP.vb
@@ -33,7 +33,6 @@ Namespace Connection
#End Region
#Region "Private Declarations"
- Private rd As MSTSCLib.IMsRdpClient5
Private RDP As AxMsRdpClient5
Private Info As Connection.Info
Private RDPVersion As Version
@@ -90,7 +89,7 @@ Namespace Connection
Me.SetRedirectKeys()
Me.SetRedirection()
Me.SetAuthenticationLevel()
- Me.SetTSGateway()
+ Me.SetRDGateway()
RDP.ColorDepth = Int(Me.Info.Colors)
@@ -156,15 +155,16 @@ Namespace Connection
#End Region
#Region "Private Methods"
- Private Sub SetTSGateway()
+ Private Sub SetRDGateway()
Try
- 'If RDP.TransportSettings.GatewayIsSupported = 1 Then
- ' MsgBox("TS Gateway supported")
- 'Else
- ' MsgBox("TS Gateway unsupported")
- 'End If
+ If RDP.TransportSettings.GatewayIsSupported = 1 Then
+ mC.AddMessage(Messages.MessageClass.InformationMsg, "RD Gateway is supported", True)
+ RDP.TransportSettings.GatewayHostname = Me.Info.RDGatewayHostname
+ Else
+ mC.AddMessage(Messages.MessageClass.InformationMsg, "RD Gateway is not supported", True)
+ End If
Catch ex As Exception
- mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP SetTSGateway failed" & vbNewLine & ex.Message, True)
+ mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP SetRDGateway failed" & vbNewLine & ex.Message, True)
End Try
End Sub
View
2  mRemoteV1/Language/Language.EN.vb
@@ -88,6 +88,8 @@
Public Const Descr_MacAddress As String = "Enter the MAC Address of the remote host if you wish to use it in Ext. Apps."
Public Const Props_UserField As String = "User Field"
Public Const Descr_UserField As String = "Feel free to enter any information you need here."
+ Public Const Props_RDGatewayHostname As String = "Gateway Hostname"
+ Public Const Descr_RDGatewayHostname As String = "Specifies the host name of the Remote Desktop Gateway server."
Public Const Props_General As String = "General"
Public Const Props_Display As String = "Display"
View
3  mRemoteV1/Notes/Misc.txt
@@ -52,6 +52,9 @@ How to add a new protocol:
Connection.Info.SetDefaultPort
UI.Window.Config.ShowHideGridItems
+Remote Desktop ActiveX Control Reference
+ http://msdn.microsoft.com/en-us/library/aa383022%28VS.85%29.aspx
+
RDP 6.0 NLA:
AdvancedSettings5.AuthenticationLevel
0 = No authentication of the server.
View
24 mRemoteV1/UI/UI.Window.Config.vb
@@ -508,7 +508,7 @@ Namespace UI
Case mRemote.Connection.Protocol.Protocols.RDP
strHide &= "ExtApp;RenderingEngine;PuttySession;ICAEncryption;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;"
Case mRemote.Connection.Protocol.Protocols.VNC
- strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;PuttySession;ICAEncryption;RDPAuthenticationLevel;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;"
+ strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;PuttySession;ICAEncryption;RDPAuthenticationLevel;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;RDGatewayHostname;"
If conI.VNCAuthMode = mRemote.Connection.Protocol.VNC.AuthMode.AuthVNC Then
strHide &= "Username;Domain;"
End If
@@ -516,23 +516,23 @@ Namespace UI
strHide &= "VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyUsername;"
End If
Case mRemote.Connection.Protocol.Protocols.SSH1
- strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;"
+ strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayHostname;"
Case mRemote.Connection.Protocol.Protocols.SSH2
- strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;"
+ strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayHostname;"
Case mRemote.Connection.Protocol.Protocols.Telnet
- strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;Password;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;Username;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;"
+ strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;Password;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;Username;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayHostname;"
Case mRemote.Connection.Protocol.Protocols.Rlogin
- strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;Password;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;Username;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;"
+ strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;Password;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;Username;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayHostname;"
Case mRemote.Connection.Protocol.Protocols.RAW
- strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;Password;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;Username;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;"
+ strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;Password;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;Username;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayHostname;"
Case mRemote.Connection.Protocol.Protocols.HTTP
- strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;PuttySession;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;"
+ strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;PuttySession;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayHostname;"
Case mRemote.Connection.Protocol.Protocols.HTTPS
- strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;PuttySession;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;"
+ strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;PuttySession;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayHostname;"
Case mRemote.Connection.Protocol.Protocols.ICA
- strHide &= "ExtApp;DisplayThemes;DisplayWallpaper;PuttySession;RDPAuthenticationLevel;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;UseConsoleSession;RenderingEngine;Port;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;"
+ strHide &= "ExtApp;DisplayThemes;DisplayWallpaper;PuttySession;RDPAuthenticationLevel;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;UseConsoleSession;RenderingEngine;Port;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayHostname;"
Case mRemote.Connection.Protocol.Protocols.IntApp
- strHide &= "CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;PuttySession;ICAEncryption;RDPAuthenticationLevel;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;"
+ strHide &= "CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;PuttySession;ICAEncryption;RDPAuthenticationLevel;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayHostname;"
End Select
If conI.IsDefault = False Then
@@ -700,6 +700,10 @@ Namespace UI
If .ExtApp Then
strHide &= "ExtApp"
End If
+
+ If .RDGatewayHostname Then
+ strHide &= "RDGatewayHostname"
+ End If
End With
Else
strHide = "Hostname;Name;"
Please sign in to comment.
Something went wrong with that request. Please try again.